mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-01-01 02:37:57 -05:00
Conflicts: Makefile.am misc/Makefile.am src/Makefile.am web/includes/Makefile.am web/js/Makefile.am web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am