sw aee81e8e44 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq ... Conflicts: app/views/layouts/base_projects.html.erb		2015-04-14 10:19:17 +08:00
..
api/mobile	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-04-07 13:47:39 +08:00
assets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
controllers	完成项目朋友圈、开发组、科研组直接的切换功能	2015-04-14 10:17:42 +08:00
helpers	修改配置modoule模块	2015-04-13 21:53:52 +08:00
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-04-07 13:47:39 +08:00
services	课程的创建动态也要显示	2015-04-07 16:32:53 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-04-14 10:19:17 +08:00