Isaac Connor e4b0e74f69 merge master

2015-09-24 10:01:27 -04:00

..

Schema

Moved the api to underneath the web directory

2014-04-29 20:41:04 +00:00

acl.ini.php

Moved the api to underneath the web directory

2014-04-29 20:41:04 +00:00

acl.php

Moved the api to underneath the web directory

2014-04-29 20:41:04 +00:00

bootstrap.php.in

Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master

2015-06-13 16:32:37 +00:00

core.php.default

merge master

2015-09-24 10:01:27 -04:00

database.php.default

Add the web/api folder to cmake

2014-04-30 12:16:46 +03:00

email.php.default

Moved the api to underneath the web directory

2014-04-29 20:41:04 +00:00

routes.php

Merged Angular UI branch API to master

2015-06-11 02:58:58 +00:00