Merge of "modules/custom/branches/1.2.x@16539" to "modules/custom/branches/1.3.x@16520".
Conflicts:
- install/install_data.sql
- install/upgrades.sql
Merge of "modules/custom/branches/1.2.x@16539" to "modules/custom/branches/1.3.x@16520".
Conflicts:
| alex | Jul 2 2017, 8:53 AM |
| Buildable 739 | |
| Build 739: After New Commit (Harbormaster Build Plan) |
| Path | Packages | ||||
|---|---|---|---|---|---|
| M | (dir) | modules/custom/branches/1.3.x/ | |||
| M | modules/custom/branches/1.3.x/install/upgrades.sql |