Merge branch 'g5'

This commit is contained in:
chicpro committed 2013-11-12 14:18:23 +09:00
commit d29e4ccbc2
16 files changed
+9 -146

No files matched your search

-1
View File
@@ -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 '',