Merge branch 'g5'

2013-11-12 14:18:23 +09:00
parent 63d57a844c c36313ce5a
commit d29e4ccbc2
16 changed files with 9 additions and 146 deletions
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@ -299,7 +299,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
  `cf_facebook_secret` varchar(255) NOT NULL,
  `cf_twitter_key` varchar(255) NOT NULL,
  `cf_twitter_secret` varchar(255) NOT NULL,
-  `cf_me2day_key` varchar(255) NOT NULL,
  `cf_1_subj` varchar(255) NOT NULL DEFAULT '',
  `cf_2_subj` varchar(255) NOT NULL DEFAULT '',
  `cf_3_subj` varchar(255) NOT NULL DEFAULT '',