wanglinchun 1ca0113204 Merge branch 'competition' into develop ... Conflicts: db/schema.rb		2014-04-25 10:26:50 +08:00
..
migrate	修改contest表中budget字段的属性，将integer改为string	2014-04-24 19:45:10 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'competition' into develop	2014-04-25 10:26:50 +08:00