Mathieu Darse 63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer ...

Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js

2015-03-10 15:25:20 +01:00

..

data_templates

PHRAS-379 #fix enhance default data templates

2015-02-17 15:12:03 +01:00

plugins

Fix CS

2014-02-26 12:44:32 +01:00

bases_structure.xml

Fix strict mode sql issue

2015-03-06 12:35:18 +01:00

blank_cterms.xml

Thesaurus refactor

2013-02-28 16:14:33 +01:00

blank_thesaurus.xml

Thesaurus refactor

2013-02-28 16:14:33 +01:00

configuration.yml

Merge remote-tracking branch 'upstream/master' into elastic-indexer

2015-03-10 15:25:20 +01:00

migrations.yml

Add Migration patch

2014-03-24 12:28:47 +01:00

minifyGroupsConfig.php

Remove Websockets dependencies

2015-03-10 09:55:43 +01:00

plugin-schema.json

Add customized twig path, plugins twig namespace

2013-07-02 22:50:03 +02:00