ouyangxuhua 7dc02d2c4f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq ... Conflicts: app/views/organizations/_show_org_document.html.erb		2015-11-12 18:00:25 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	组织模块功能实现	2015-11-12 09:32:00 +08:00
controllers	组织模块功能缺陷修改	2015-11-12 17:52:47 +08:00
helpers	组织模块功能实现	2015-11-12 09:32:00 +08:00
models	组织模块功能缺陷修改	2015-11-12 17:52:47 +08:00
services	申请加入课程，允许身份覆盖	2015-10-30 15:55:48 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-11-12 18:00:25 +08:00