Nicolas Le Goff 81763db182 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Helper/Record/Helper.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/caption/record.php
	lib/classes/registry.php
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php

2014-08-19 12:17:18 +02:00

..

Field

Fix CS

2014-07-17 15:17:04 +02:00

field.php

Merge branch '3.8'

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

interface.php

Make search engine a real service

2014-01-07 16:45:58 +01:00

record.php

Merge branch '3.8'

2014-08-19 12:17:18 +02:00