z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: config/locales/zh.yml		2015-03-10 17:21:59 +08:00
..
api/mobile	1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成	2015-03-10 17:20:30 +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 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 17:21:59 +08:00
helpers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 10:08:18 +08:00
models	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 17:21:59 +08:00
services	用户课程动态按更新时间倒序排列	2015-03-09 17:32:38 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-03-10 17:21:59 +08:00