daiao c115fad8a1 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining ... Conflicts: db/schema.rb		2017-02-20 14:09:59 +08:00
..
migrate	Merge branch 'develop' into dev_raining	2017-02-20 10:15:47 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	实训项目的列表页面	2017-02-20 14:08:48 +08:00