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

..

account

Fix geonames amd loading

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

admin

Merge remote-tracking branch 'upstream/3.8'

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

api/auth

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

client

Merge remote-tracking branch 'upstream/3.8'

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

common

header size

2015-02-19 18:35:18 +09:00

developers

Fix latest merge

2014-06-19 16:11:27 +02:00

geonames

Fix twig tags

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

lightbox

Fix latest merge

2014-06-19 16:11:27 +02:00

login

Fix latest merge

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

prod

Merge remote-tracking branch 'upstream/3.8'

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

report

Merge branch '3.8'

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

setup

Fix installation

2015-02-06 13:26:49 +01:00

thesaurus

Merge remote-tracking branch 'upstream/3.8'

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

email-template.html.twig

Fix trans tag in templates

2015-02-05 21:48:28 +01:00

overview.html.twig

Merge branch '3.8'

2014-02-26 13:17:30 +01:00