You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		9 years ago
..
api/mobile	git pull后重新commit	9 years ago
assets	Merge branch 'rep_quality' into develop	9 years ago
controllers	git pull后重新commit	9 years ago
helpers	git pull后重新commit	9 years ago
models	git pull后重新commit	9 years ago
services	微信项目相关功能开发，班级角色功能等	9 years ago
sweepers	…
tasks	…
views	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	9 years ago