cxt 4de81605a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb		2016-03-17 15:19:41 +08:00
..
migrate	课程导语发送这改成课堂使者	2016-03-17 15:12:28 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-03-17 15:19:41 +08:00