Romain Neutron 8663f49228 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Core/Version.php

2013-11-20 15:53:50 +01:00

..

console

Merge branch '3.8'

2013-11-20 15:53:50 +01:00

report

Use configuration property accessor

2013-11-18 18:48:27 +01:00

report.php

Use short array declaration

2013-11-18 13:57:33 +01:00