Isaac Connor 69090563d5 Merge branch 'master' into video ... Conflicts: src/CMakeLists.txt src/zm_monitor.cpp		2014-11-28 14:23:05 -05:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	fix saving groups	2014-11-25 14:29:15 -05:00
config.php.in	Merge branch 'mysql2PDO'	2014-03-20 16:48:03 -04:00
control_functions.php	more updates	2013-12-17 11:16:20 -05:00
database.php	fixes WRT to db logging. I believe fixes issue #504	2014-09-26 14:43:58 -04:00
functions.php	Merge branch 'master' into video	2014-11-28 14:23:05 -05:00
lang.php	Update lang.php	2013-08-16 12:05:33 +02:00
logger.php	remove unneccessary quoting and escaping	2013-12-06 15:51:36 -05:00