Nicolas Le Goff 3565d1c795 Merge branch '3.8' into fix-latest-merge ...

Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig

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

..

Field

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

cgu.php

Refactor && Typo && Use plain objects as function parameters instead of ids

2014-02-26 12:10:54 +01:00

descriptionStructure.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

field.php

Add reconnectable connection

2014-03-03 01:00:15 +01:00

status.php

Merge branch '3.8'

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

subdef.php

Merge branch '3.8' into fix-latest-merge

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

subdefsStructure.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00