socialforge/app
alan 799f561d77 Merge branch 'szzh' into memcached_alan
Conflicts:
	Gemfile
	app/views/issues/index.html.erb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
2015-05-20 17:42:26 +08:00
..
api/mobile 用户留言列表api 2015-05-20 17:27:17 +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' into memcached_alan 2015-05-20 17:42:26 +08:00
helpers 缺陷列表搜索栏中添加“我” 2015-05-20 14:40:51 +08:00
models 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
services Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-20 17:27:35 +08:00
sweepers
tasks 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
views Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-20 17:40:48 +08:00