From 7f81430745795fa166327c5da7543f335b2f5231 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 08 May 2014 12:41:51 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
install/sql/ispconfig3.sql | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 4d94ba0..42b310b 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1765,6 +1765,7 @@
`database_name` varchar(64) DEFAULT NULL,
`database_name_prefix` varchar(50) NOT NULL default '',
`database_quota` int(11) unsigned DEFAULT NULL,
+ `last_quota_notification` date NULL default NULL,
`database_user_id` int(11) unsigned DEFAULT NULL,
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
`database_charset` varchar(64) DEFAULT NULL,
@@ -2290,7 +2291,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4p1');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1