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

..

actions

Merge remote-tracking branch 'upstream/3.8'

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

Baskets

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

feeds

Fix latest merge

2014-06-24 14:56:09 +02:00

orders

Merge branch '3.8'

2014-12-09 13:59:29 +01:00

preview

Design update

2015-02-23 15:15:55 +09:00

results

Fix latest merge

2014-10-13 12:58:20 +02:00

Share

Fix twig tags

2013-12-03 20:02:39 +01:00

Story

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

templates

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

Tooltip

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

upload

Merge remote-tracking branch 'upstream/3.8'

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

User

Fix geonames amd loading

2015-02-06 16:04:18 +01:00

WorkZone

Design update

2015-02-23 15:15:55 +09:00

index.html.twig

Merge remote-tracking branch 'upstream/3.8'

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

notifications.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

thesaurus.js.twig

Merge branch '3.8'

2014-09-02 19:09:38 +02:00

TOU_ajax.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU_base.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU.html.twig

Merge branch '3.7'

2012-12-17 15:30:05 +01:00