Tim 57bb2f69a4 Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou ... Conflicts: app/views/organizations/_org_custom_right2.html.erb		2016-06-03 09:12:36 +08:00
..
api/mobile	微信动态的描述过滤掉html	2016-05-26 17:18:58 +08:00
assets	Merge branch 'hjq_beidou' into develop	2016-05-06 10:16:56 +08:00
controllers	右二优化	2016-06-03 08:45:43 +08:00
helpers	模式二中添加课程定配	2016-06-02 21:32:56 +08:00
models	组织添加设为精品项目，热门课程	2016-06-01 17:38:41 +08:00
services	微信的链接修改	2016-05-24 09:51:27 +08:00
sweepers	…
tasks	…
views	Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou	2016-06-03 09:12:36 +08:00