z9hang 56aa2fb8dc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		2014-08-13 11:21:37 +08:00
..
migrate	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-08-13 11:21:37 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	积分计算修改	2014-08-13 11:17:22 +08:00