Changeset 2c6ace5 in iPeer

Timestamp:
2012-11-20T14:43:26-08:00 (5 years ago)
Author:
Compass <pan.luo@…>
Branches:
3.1.x, dev, hotfix, master, pagodabox, ticket463
Children:
303e53c, 8290765
Parents:
265c3d3
Message:

added ours merge strategy to app/config/core.php so that different branch can have different debug settings

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.