Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/ae501245acb6019fd59ecfaf5dc2aa117dc89e3a.file.zonet.html.php

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>