html renew
slice
slice
Merge branch 'release-v8.0' of 192.168.5.102:~/ccf into feature-seven
slice
slice
Merge branch 'bugfix-8.0' of 192.168.5.102:~/ccf into feature-seven

Conflicts:
	project/templates/project/index.html
slice
slice
modify dhcp selected feature
invite list
slice`
prevent invite user again
Merge branch 'bugfix-8.0' of 192.168.5.102:ccf into feature-tzf-8.0
Merge branch 'master' of 192.168.5.102:ccf into feature-tzf-8.0
apply test
slice
click as read
typo
modify switch monitor page