huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou ... Conflicts: db/schema.rb		2016-05-31 18:38:05 +08:00
..
migrate	Merge branch 'develop' into hjq_beidou	2016-05-31 18:38:05 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	组织管理员提供学霸功能	2016-05-31 10:31:08 +08:00