From adfecbfba2c04131f03bb1c0fcb75356ded26f4f Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 12 Feb 2016 10:45:41 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 68cf272..d025b7f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -211,6 +211,7 @@
   `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_web_subdomain` int(11) NOT NULL DEFAULT '-1',
   `limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1',
   `limit_ftp_user` int(11) NOT NULL DEFAULT '-1',
@@ -335,6 +336,7 @@
   `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
+  `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
   `limit_web_subdomain` int(11) NOT NULL default '-1',
   `limit_web_aliasdomain` int(11) NOT NULL default '-1',
   `limit_ftp_user` int(11) NOT NULL default '-1',

--
Gitblit v1.9.1