merge conflicts in update-script

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2016-11-18 08:50:03 +01:00
parent 547140bafb d245bca445
commit eb8449fd79
5 changed files with 30 additions and 2 deletions
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3519,3 +3519,12 @@ if (isFroxlorVersion('0.9.38-rc2')) {
        showUpdateStep("Updating from 0.9.38-rc2 to 0.9.38 final", false);
        updateToVersion('0.9.38');
 }
+
+if (isDatabaseVersion('201610070')) {
+
+	showUpdateStep("Add Nginx http2 setting");
+	Settings::AddNew("system.nginx_http2_support", 0);
+	lastStepStatus(0);
+
+	updateToDbVersion('201611180');
+}