Isaac Connor 793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas		2018-04-02 10:43:07 -07:00
..
Config	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
Console	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
Controller	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
Model	Reintroduced empty check rule, closed paranthesis	2018-03-27 10:55:36 -04:00
Plugin	revert to v3.1.0 of CRud	2018-03-22 12:01:38 -04:00
View	further merges from cakephp 2.10.8	2018-03-21 13:09:55 -04:00
vendor	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
webroot	remove unneeded, empty files	2016-12-26 09:49:14 -06:00
.htaccess	Added API routing	2015-07-13 18:55:28 +00:00
index.php	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00