backgroup program
backgroup program
modify bind default config
delete cache file
add ignore filelist
Merge branch 'master' of git.ishopex.cn:ken/opshub
amen
amen
Merge branch 'master' of git.ishopex.cn:ken/opshub

Conflicts:
	.gitignore
添加管理后台 dashboard
change forward dns server to china telecome
Merge branch 'master' of git.ishopex.cn:ken/opshub

Conflicts:
	.gitignore
	app/bind/includes/templates/named.conf.tpl
nginx代理模块完成
添加nginx proxy配置批量导入工具
添加nginx proxy配置批量导入工具
ok
修改nginx proxy配置导入工具bug
bug fix
bug fix
Merge branch 'master' of git.ishopex.cn:ken/opshub