Nicolas Le Goff 5b3e699599 Merge remote-tracking branch 'upstream/3.8' ...

Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css

2015-02-23 19:16:56 +01:00

..

adapter.php

Merge remote-tracking branch 'upstream/3.8'

2015-02-23 19:16:56 +01:00

exportElement.php

Merge branch '3.8'

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

Interface.php

Merge branch '3.8'

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

orderElement.php

Merge branch '3.8'

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

preview.php

Merge branch '3.8'

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