Thibaud Fabre cd530b4696 Fix merge failure in V1Controller

2016-05-25 17:40:10 +02:00

..

BasketController.php

Remove some unused statements

2016-03-22 15:55:51 +01:00

LazaretController.php

Merge branch '4.0'

2016-04-11 14:28:28 +02:00

OAuth2Controller.php

Add configuration option to disable SSL requirement on API

2016-05-24 15:38:59 +02:00

Result.php

Refactor and fixup some bugs in V1Controller

2015-12-22 14:24:32 +01:00

SearchController.php

WIP

2016-05-19 13:44:01 +02:00

V1Controller.php

Fix merge failure in V1Controller

2016-05-25 17:40:10 +02:00