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

Conflicts:
	public/tpls/templates_c/557724488c0d1472f55b9b370819058ffefc6297.file.notice.html.php
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	sys/config/db-cred.inc.php

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

Conflicts:
	public/tpls/templates_c/230cf9487e21db83bfe175beb267a8c56700c95a.file.infov_edit.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	sys/config/db-cred.inc.php

Signed-off-by: Demonsu <245681117@qq.com>