daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: public/assets/wechat/app.html public/assets/wechat/new_project.html public/javascripts/wechat/directives/ellipsis.js public/stylesheets/weui/weixin.css		2016-07-29 22:03:45 +08:00
..
weixin.css	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-07-29 22:03:45 +08:00
weui.min.css	修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等	2016-07-08 17:22:58 +08:00