Merge remote-tracking branch 'refs/remotes/origin/master' into 3.0.2.3

E-F-A · May 20, 2017 · 4a004e7 · 4a004e7
2 parents 7579007 + d1a7068
commit 4a004e7
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/build/MYSQL/create.sql b/build/MYSQL/create.sql
@@ -124,8 +124,6 @@ CREATE TABLE IF NOT EXISTS `maillog` (
   `time` time DEFAULT NULL,
   `headers` mediumtext COLLATE utf8_unicode_ci,
   `quarantined` tinyint(1) DEFAULT '0',
-  `rblspamreport` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `token` CHAR(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`maillog_id`),
   KEY `maillog_datetime_idx` (`date`,`time`),
   KEY `maillog_id_idx` (`id`(20)),