Nicolas Le Goff 5e33fdafe4 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/classes/caption/field.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/download.php
	lib/classes/task/period/apibridge.php

2014-12-16 13:07:25 +01:00

..

console

Merge branch '3.8'

2014-10-09 19:40:33 +02:00

report

Merge branch '3.8'

2014-12-16 13:07:25 +01:00

report.php

Fix merge 3.8

2014-12-09 14:01:00 +01:00