XuCheng642 ed8a1e4510 Merge branch 'dev_xucheng' into develop ... Conflicts: app/controllers/managements_controller.rb app/views/courses/new.html.erb app/views/users/show.html.erb config/routes.rb		2017-09-01 19:44:19 +08:00
..
add_school.js.erb	first commit	2017-04-07 10:16:13 +08:00
destroy.js.erb	缺陷修复	2017-09-01 19:37:09 +08:00
index.html.erb	first commit	2017-04-07 10:16:13 +08:00
upload_logo.html.erb	Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop	2017-09-01 15:11:02 +08:00