alan 70330f0f4b Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache ... Conflicts: app/views/layouts/_user_project_list.html.erb Signed-off-by: alan <547533434@qq.com>		2015-06-01 10:42:18 +08:00
..
api/mobile	课程评论添加上拉分页	2015-05-29 14:22:43 +08:00
assets	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-30 14:27:56 +08:00
controllers	Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache	2015-06-01 10:38:53 +08:00
helpers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-05-23 10:40:48 +08:00
models	注释掉暂时未完成的功能	2015-05-29 16:07:57 +08:00
services	Merge branch 'dev_hjq' into szzh	2015-05-29 16:12:50 +08:00
sweepers	…
tasks	将删除版本库的操作置入后台	2015-04-28 10:33:15 +08:00
views	Merge branch 'develop' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache	2015-06-01 10:42:18 +08:00