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
..
codemirror	代码查重功能增加,管理员界面增加代码测试列表.	2016-04-14 11:29:22 +08:00
kindeditor	Merge branch 'yuanke' into develop	2016-06-27 15:58:26 +08:00
wechat	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-07-29 22:03:45 +08:00