12 Commits

Include renames

Author	SHA1	Message	Date
Isaac Connor	23f384407e	blah	2017-04-24 14:00:47 -04:00
Isaac Connor	bafbdc28ed	update to whats in master	2017-04-21 14:46:40 -04:00
Isaac Connor	a164118ad3	Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas	2017-04-16 11:26:30 -04:00
Isaac Connor	273229858f	Merge branch 'master' into storageareas	2017-04-16 11:26:18 -04:00
Isaac Connor	f1f54205fb	Merge branch 'remove_BOM' into storageareas	2017-04-16 09:28:35 -04:00
Isaac Connor	5e0012569f	use dos2unix to remove BOM	2017-04-16 09:22:37 -04:00
Andrew Bauer	d2490cf7e3	make cake tmp = zoneminder tmp	2017-04-14 15:11:41 -05:00
Isaac Connor	5ae34a7561	Merge branch 'master' into storageareas	2017-01-02 09:39:10 -05:00
Andy Bauer	2dda2d9e1e	remove unneeded, empty files	2016-12-26 09:49:14 -06:00
Isaac Connor	c9a1a9020d	Merge h264	2016-03-31 11:03:36 -04:00
SteveGilvarry	b294f210dc	Update to CakePHP 2.8.0 copy in lib folder	2016-02-25 23:25:24 +11:00
Kyle Johnson	f1f3de6d7d	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00