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

..

actions

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

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

Baskets

Merge branch '3.8' into fix-latest-merge

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

orders

Merge branch '3.8'

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

preview

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

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

results

Fix status display

2015-02-24 15:28:29 +01: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/master' into 20150306-elastic-indexer

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

User

Fix geonames amd loading

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

WorkZone

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

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

index.html.twig

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

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

notifications.html.twig

Fix twig tags

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

thesaurus.js.twig

Optim

2015-02-27 16:09:10 +01: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