huang faf5e89cc2 Merge branch 'weixin_guange' into develop ... Conflicts: 1234567 app/views/blogs/_article.html.erb db/schema.rb		2016-05-19 16:04:27 +08:00
..
activities.html	微信问题修改	2016-05-19 15:20:46 +08:00
app.html	Merge branch 'weixin_guange' into develop	2016-05-03 17:14:58 +08:00
blog_detail.html	Merge branch 'weixin_guange' into develop	2016-05-19 16:04:27 +08:00
course_discussion.html	Merge branch 'weixin_guange' into develop	2016-05-19 16:04:27 +08:00
course_notice.html	微信回复多次点击，仅第一次生效	2016-05-11 09:38:02 +08:00
homework_detail.html	微信问题修改	2016-05-19 15:20:46 +08:00
issue.html	动态和作业的api	2016-03-30 10:32:45 +08:00
issue_detail.html	微信问题修改	2016-05-19 15:20:46 +08:00
jour_message_detail.html	微信回复多次点击，仅第一次生效	2016-05-11 09:38:02 +08:00
project_discussion.html	Merge branch 'weixin_guange' into develop	2016-05-19 16:04:27 +08:00