paolo 4f8826dc3f Merge origin/ci into ci ...

Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php

2016-05-24 12:32:32 +02:00

..

_data

Merge origin/ci into ci

2016-05-24 12:32:32 +02:00

_output

BugFix

2016-04-28 06:47:17 +02:00

_support

Merging

2016-04-15 15:47:56 +02:00

tests

Merge origin/ci into ci

2016-05-24 12:32:32 +02:00

_bootstrap.php

Codeception

2015-02-20 12:30:26 +01:00

codeception.dist.yml

Move CodeceptionTests for PHPCI-Compatibility

2016-04-27 21:03:59 +02:00