Merge remote-tracking branch 'Cockatrice/master' into fix_1387

This commit is contained in:
Jeff 2015-08-20 22:17:06 -04:00
commit b3d96cc5da

View file

@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
PRIMARY KEY (`version`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO cockatrice_schema_version VALUES(6);
INSERT INTO cockatrice_schema_version VALUES(7);
CREATE TABLE IF NOT EXISTS `cockatrice_decklist_files` (
`id` int(7) unsigned zerofill NOT NULL auto_increment,