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	首页动态优化	2015-07-24 11:47:45 +08:00
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	first commit	2013-08-01 10:33:49 +08:00
tasks	添加附件时转换office文档	2015-06-03 11:14:33 +08:00
views	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00