Isaac Connor 2f32c3895b Merge branch 'release-1.28' ... Conflicts: web/skins/flat/js/skin.js		2014-10-22 15:10:19 -04:00
..
debian	Merge branch 'release-1.28'	2014-10-22 15:10:19 -04:00
fedora	Update zoneminder.cmake.f20.spec	2014-10-18 17:36:12 -05:00
opensuse	Merge pull request #502 from knnniggett/systemd-2	2014-09-03 15:59:42 -04:00
redhat	Redhat and Fedora distro folder housekeeping	2014-10-05 09:54:29 -05:00
ubuntu1204	Revert "replace uri_encode with uri_escape"	2014-10-21 15:17:34 -04:00