Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css

1 files changed, 16 insertions, 0 deletions

diff --git a/install.sql b/install.sql
index bb54b9b4..969107a2 100644
--- a/install.sql
+++ b/install.sql
@@ -280,6 +280,22 @@ CREATE TABLE IF NOT EXISTS `flood` (
   KEY `time` (`time`)
 ) ENGINE=MyISAM DEFAULT CHARSET=ascii COLLATE=ascii_bin AUTO_INCREMENT=1 ;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ban_appeals`
+--
+
+CREATE TABLE IF NOT EXISTS `ban_appeals` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `ban_id` int(10) unsigned NOT NULL,
+  `time` int(10) unsigned NOT NULL,
+  `message` text NOT NULL,
+  `denied` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `ban_id` (`ban_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
+
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;