sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		2015-09-18 11:34:29 +08:00
..
migrate	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-09-18 11:34:29 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	1、之前普通作业更改为匿评作业。。。	2015-09-18 09:32:25 +08:00