daiao e86bd6728e Merge branch 'cxt_course' into develop ... Conflicts: app/controllers/users_controller.rb app/helpers/application_helper.rb app/views/users/_user_activities.html.erb db/schema.rb		2016-12-24 16:48:48 +08:00
..
api/mobile	修改个人信息中的邮箱去除	2016-12-13 11:04:31 +08:00
assets	竞赛框架搭建	2016-12-22 10:01:37 +08:00
controllers	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00
helpers	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00
models	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00
services	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00
sweepers	…
tasks	…
views	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00