sw a3cbcdad51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		2014-07-31 10:13:51 +08:00
..
migrate	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-07-31 10:13:51 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	首页定制，是否显示课程，竞赛	2014-07-30 15:26:55 +08:00