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

Conflicts:
	public/tpls/templates_c/98ac2491da6aa96dd5b95ddfd79f9643e04a48d2.file.act_handle.html.php
	public/tpls/templates_c/c5a0ad510536f21ef5b74762cdc80992d0848921.file.team.html.php
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer
Signed-off-by: Aresxiao <xiaogeng91@foxmail.com> week_act_list backstage
Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

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

Signed-off-by: Aresxiao <xiaogeng91@foxmail.com> db conflicts