From d240f6d285ea4696b087763d99089591cb02fcfd Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 13 Dec 2015 08:08:42 -0500
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/sql/incremental/upd_dev_collection.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index d9bca16..3e80fbd 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -188,4 +188,4 @@
   ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
   ADD COLUMN `custom` text;
 
-ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n';
\ No newline at end of file
+ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n' AFETR `ssl`;

--
Gitblit v1.9.1