lizanle d26b51c982 Merge branch 'szzh' into dev_zanle ... Conflicts: app/controllers/organizations_controller.rb db/schema.rb		2015-12-31 15:44:57 +08:00
..
api/mobile	…
assets	组织界面增加分栏	2015-12-04 17:34:48 +08:00
controllers	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00
helpers	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00
models	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00
services	新建课程和课程配置页面增加结束学期	2015-12-31 11:12:09 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00