Isaac Connor d9a31f7fb6 Merge branch 'master' into storageareas		2016-10-26 13:39:31 -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	Make api use zm.conf	2016-04-30 13:50:09 -04:00
core.php.default	remove core.php, modify core.php.default	2015-08-29 14:53:39 -05:00
database.php.default	Merge branch 'master' into storageareas	2016-10-26 13:39:31 -04: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