yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange ... Conflicts: db/schema.rb public/assets/wechat/homework_detail.html public/javascripts/wechat/controllers/activity.js		2016-07-28 15:23:12 +08:00
..
api/mobile	git pull后重新commit	2016-07-28 15:11:04 +08:00
assets	Merge branch 'rep_quality' into develop	2016-06-24 19:17:26 +08:00
controllers	git pull后重新commit	2016-07-28 15:11:04 +08:00
helpers	git pull后重新commit	2016-07-28 15:11:04 +08:00
models	git pull后重新commit	2016-07-28 15:11:04 +08:00
services	微信项目相关功能开发，班级角色功能等	2016-07-28 14:49:45 +08:00
sweepers	…
tasks	…
views	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-07-28 15:23:12 +08:00