Revision 03a02e057ed3692dc2c0bc9d033698599057c3bf
Committed on 27/10/2015 12:34 pm by
Matthieu Severe <msevere@clever-age.com> [GitHub Diff]
Merge branch 'master' of git://github.com/masev/MasevSettingsBundle
Conflicts:
ezpublish_legacy/masev_settings/design/standard/templates/configuration/index.tpl