Isaac Connor 880e77b096 Merge branch 'master' into multi-server ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h		2015-08-19 13:30:48 -04:00
..
Makefile.am	Added missing javascript file to Makefile.am	2015-07-27 09:53:59 +02:00
classic.js	move the window size definitions into a separate file for each css version flat or classic	2015-05-01 16:02:55 -04:00
dark.js	Add dark CSS for classic view	2015-07-27 09:53:59 +02:00
flat.js	fix monitor popup size	2015-07-09 11:44:27 -04:00
jquery-1.7.2.js	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
jquery.js	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
jquery.url	upgrade bundled jQuery (Closes: #785)	2015-04-15 11:39:29 +10:00
skin.js	move the window size definitions into a separate file for each css version flat or classic	2015-05-01 16:02:55 -04:00
skin.js.php	propagate canEditGroup permission	2015-08-15 13:22:13 -05:00