Nicolas Le Goff bd1e4516bd Merge branch '3.8' ...

Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig

2014-02-03 19:02:22 +01:00

..

data_templates

[SearchEngine] Fix files mode

2013-01-17 11:43:30 +01:00

plugins

Fix CS

2013-12-03 21:01:43 +01:00

bases_structure.xml

Merge branch '3.8'

2013-12-20 09:53:09 +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 branch '3.8'

2014-02-03 19:02:22 +01:00

migrations.yml

Fix neutron's comments

2013-11-18 16:22:28 +01:00

minifyGroupsConfig.php

Use short array declaration

2013-11-18 13:57:33 +01:00

plugin-schema.json

Add customized twig path, plugins twig namespace

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