Signed-off-by: yeguangsuixing <411707420@qq.com>
Signed-off-by: yeguangsuixing <411707420@qq.com>
Signed-off-by: yeguangsuixing <411707420@qq.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/557724488c0d1472f55b9b370819058ffefc6297.file.notice.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/zonet.php
	sys/config/db-cred.inc.php

Signed-off-by: yeguangsuixing <411707420@qq.com>
Signed-off-by: yeguangsuixing <411707420@qq.com>