Merge branch 'master' of github.com:gnuboard/yc5

Conflicts:
	extend/shop.extend2.php
This commit is contained in:
gnuboard
2013-11-06 18:27:20 +09:00
17 changed files with 251 additions and 209 deletions

View File

@ -295,11 +295,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
`de_cart_keep_term` int(11) NOT NULL DEFAULT '0',
`de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0',
`de_admin_buga_no` varchar(255) NOT NULL DEFAULT '',
`de_sms_use` varchar(255) NOT NULL DEFAULT '',
`de_icode_id` varchar(255) NOT NULL DEFAULT '',
`de_icode_pw` varchar(255) NOT NULL DEFAULT '',
`de_icode_server_ip` varchar(255) NOT NULL DEFAULT '',
`de_icode_server_port` varchar(255) NOT NULL DEFAULT '',
`de_kcp_site_key` varchar(255) NOT NULL DEFAULT '',
`de_vbank_use` varchar(255) NOT NULL DEFAULT '',
`de_taxsave_use` tinyint(4) NOT NULL,