lizanle eaf4ad354f Merge branch 'szzh' into dev_zanle ... Conflicts: app/controllers/courses_controller.rb app/services/courses_service.rb app/views/courses/join.js.erb public/stylesheets/new_user.css		2015-10-26 10:21:13 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	添加功能：管理员界面发送系统消息	2015-09-09 17:05:32 +08:00
controllers	Merge branch 'szzh' into dev_zanle	2015-10-26 10:21:13 +08:00
helpers	Merge branch 'szzh' into dev_zanle	2015-10-26 10:21:13 +08:00
models	Merge branch 'szzh' into dev_zanle	2015-10-26 10:21:13 +08:00
services	Merge branch 'szzh' into dev_zanle	2015-10-26 10:21:13 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'szzh' into dev_zanle	2015-10-26 10:21:13 +08:00