3 Commits

Author	SHA1	Message	Date
wanglinchun	189b935d5b	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: db/schema.rb	2014-04-25 11:22:33 +08:00
wanglinchun	ed71a3faa1	调整删除竞赛的显示样式及位置	2014-04-25 11:10:13 +08:00
wanglinchun	2a278e0a2d	all	2014-04-03 22:38:18 +08:00