Merge of "modules/custom/branches/1.2.x@16383" to "modules/custom/branches/1.3.x@16253".
Conflicts:
- install/upgrades.sql
- units/sections/sections_config.php
- units/widgets/widget_eh.php
- units/widgets/widgets_config.php
Merge of "modules/custom/branches/1.2.x@16383" to "modules/custom/branches/1.3.x@16253".
Conflicts:
alex | Nov 12 2016, 11:21 AM |
Buildable 489 | |
Build 489: After New Commit (Harbormaster Build Plan) |