cxt 95595c6fe6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb		2017-03-03 15:37:55 +08:00
..
migrate	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2017-03-03 15:37:55 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	超级管理员的待审批申请中，更改申请高校名称后，依然在待审批消息中显示	2017-03-03 11:13:00 +08:00