silverstripe-installer/.mergesources.yml
wrossiter 8b8199f1f0 BUGFIX: pass $allowHTML through to DatalessField. PATCH via escaped (#4822)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@95199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00

18 lines
641 B
YAML

# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
# Keeps track of all opensource branches of submodules
# that could be merged back to the current submodule paths.
trunk:
.: /open/phpinstaller/trunk
sapphire: /open/modules/sapphire/trunk
cms: /open/modules/cms/trunk
jsparty: /open/modules/jsparty/trunk
wcc:
sapphire: /modules/sapphire/branches/2.4-wcc
cms: /modules/cms/branches/2.4-wcc
jsparty: /modules/jsparty/branches/2.4-wcc
wc:
sapphire: /modules/sapphire/branches/2.3.1-womenconf
cms: /modules/cms/branches/2.3.1-womenconf
jsparty: /modules/jsparty/branches/2.3.1-womenconf