#14 develop

Merged

tianya merged 8 commits from develop into master 2 years ago

Author	SHA1	Message	Date
tianya	2bd0b7356f	bump 6.1.1	2 years ago
tianya	037fff588c	Update mychannel_edit.htm	2 years ago
tianya	cd0e3bb50b	生产环境严格模式	2 years ago
tianya	35484a060f	修正子目录安装问题，移除fck编辑器	2 years ago
tianya	3d567cd592	Update sys_safetest.htm	2 years ago
tianya	83b9685910	fix	2 years ago
tianya	8b002c2864	重写联动类型缓存模式&移除对memcache支持	2 years ago
tianya	254cc5ba9d	错误捕获	2 years ago