Merge branch 'storageareas' into newpointone

Conflicts: web/lang/en_gb.php web/skins/classic/views/filter.php
2015-12-28 13:13:49 -05:00 · 2015-12-28 13:13:49 -05:00 · 13689d7a7d
parent 98b6ef36d4 8a29d946bc
commit 13689d7a7d
2 changed files with 2 additions and 1 deletions
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@ -548,7 +548,7 @@ CREATE TABLE `Storage` (
 	`Id`	smallint(5) unsigned NOT NULL auto_increment,
 	`Path`	varchar(64)	NOT NULL default '',
 	`Name`	varchar(64) NOT NULL default '',
-	PRIMARY KEY (`Id`),
+	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 --
--- a/distros/ubuntu1504_cmake/control
+++ b/distros/ubuntu1504_cmake/control
@ -55,6 +55,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,policykit-1
        ,rsyslog | system-log-daemon
        ,zip
+        ,python-sphinx-rtd-theme
 Recommends: ${misc:Recommends}
           ,libapache2-mod-php5 | php5-fpm
           ,mysql-server | virtual-mysql-server