sw cf5b03a379 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/courses/_member_list.html.erb		2014-12-10 17:56:50 +08:00
..
en.yml	修改课程资源模块相关问题	2014-11-22 13:45:17 +08:00
zh.yml	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-12-10 17:56:50 +08:00