huang a602a6aa63 Merge branch 'cxt_course' into develop ... Conflicts: app/views/users/_course_message.html.erb		2016-05-03 17:12:38 +08:00
..
api/mobile	Merge branch 'weixin_guange' into develop	2016-04-12 15:56:08 +08:00
assets	缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息	2016-04-27 10:28:36 +08:00
controllers	Merge branch 'cxt_course' into develop	2016-05-03 17:12:38 +08:00
helpers	解决冲突	2016-04-29 20:31:31 +08:00
models	Merge branch 'cxt_course' into develop	2016-05-03 17:12:38 +08:00
services	微信模板消息的颜色、去掉模板消息的最后一行	2016-04-25 11:12:34 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'cxt_course' into develop	2016-05-03 17:12:38 +08:00