huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb 解决冲突		2015-12-16 10:02:08 +08:00
..
migrate	Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop	2015-12-16 10:02:08 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	解决英雄榜两个用户同时存在的but	2015-12-16 10:00:10 +08:00