Benoît Burnichon c63f8d777f Merge branch '4.0' ...

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/ControllerProvider/Api/V2.php

2016-02-23 16:27:04 +01:00

..

adapter.php

Add touch capability to record_adapter.

2016-02-23 10:40:01 +01:00

exportElement.php

rename is_downloable to isDownloable

2016-02-10 16:01:24 +01:00

orderElement.php

bump copyright year

2016-01-05 13:38:14 +01:00

preview.php

media_subdef could sometimes be constructed without a proper URL

2016-02-05 15:36:19 +01:00