Fix conflicts when merging master

2014-12-31 12:22:55 +01:00 · 2014-12-31 12:22:55 +01:00 · 091b31ae93
parent 45edab3ad9
commit 091b31ae93
2 changed files with 4 additions and 0 deletions
--- a/distros/debian8/zoneminder.dirs
+++ b/distros/debian8/zoneminder.dirs
@ -6,3 +6,5 @@ var/cache/zoneminder/temp
 usr/share/zoneminder/db
 usr/share/dbconfig-common/data/zoneminder/install
 usr/share/dbconfig-common/data/zoneminder/upgrade/mysql
+etc/zm/plugins.d
+usr/share/zoneminder/plugins
--- a/web/skins/classic/views/js/Makefile.am
+++ b/web/skins/classic/views/js/Makefile.am
@ -33,6 +33,8 @@ dist_web_DATA = \
 	montage.js \
 	montage.js.php \
 	options.js.php \
+	plugin.js \
+	plugin.js.php \
 	postlogin.js.php \
 	state.js \
 	state.js.php \