z9hang 2501f31ef1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		2014-06-26 15:15:46 +08:00
..
migrate	添加项目个人得分统计功能	2014-06-26 15:05:24 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-06-26 15:15:46 +08:00