Nicolas Le Goff ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer ...

Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css

2015-03-10 14:36:31 +01:00

..

Field

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

cgu.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

descriptionStructure.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

field.php

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

2015-03-10 14:36:31 +01:00

status.php

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

2015-03-10 14:36:31 +01:00

subdef.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00

subdefsStructure.php

Merge branch '3.8'

2015-02-05 18:38:49 +01:00