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/include/login.html
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php

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