huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange ... Conflicts: Gemfile app/models/user.rb db/schema.rb lib/trustie.rb 解决冲突		2015-10-10 16:09:05 +08:00
..
api/mobile	首页动态优化	2015-07-24 11:47:45 +08:00
assets	添加功能：管理员界面发送系统消息	2015-09-09 17:05:32 +08:00
controllers	Merge branch 'szzh' into gitlab_guange	2015-10-10 16:09:05 +08:00
helpers	修复项目issue中，图片显示超出边界的问题	2015-09-28 16:08:47 +08:00
models	Merge branch 'szzh' into gitlab_guange	2015-10-10 16:09:05 +08:00
services	项目邀请添加：姓、名、性别	2015-10-09 10:33:10 +08:00
sweepers	…
tasks	修改发系统消息后跳转路劲	2015-09-11 09:45:28 +08:00
views	Merge branch 'szzh' into gitlab_guange	2015-10-10 16:09:05 +08:00