Merge branch 'g4s'

2013-08-08 16:09:21 +09:00
parent 8a69ff7b73 0362f7db17
commit 7110d6eb5f
37 changed files with 529 additions and 213 deletions
--- a/install/gnuboard4s.sql
+++ b/install/gnuboard4s.sql
@ -192,6 +192,7 @@ DROP TABLE IF EXISTS `g4s_config`;
 CREATE TABLE IF NOT EXISTS `g4s_config` (
  `cf_title` varchar(255) NOT NULL DEFAULT '',
  `cf_admin` varchar(255) NOT NULL DEFAULT '',
+  `cf_admin_email` varchar(255) NOT NULL DEFAULT '',
  `cf_include_index` varchar(255) NOT NULL DEFAULT '',
  `cf_include_head` varchar(255) NOT NULL DEFAULT '',
  `cf_include_tail` varchar(255) NOT NULL DEFAULT '',