Signed-off-by: Demonsu <245681117@qq.com>
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/54c0da45b9a2ded0a3fc82e4e77c94572d99005c.file.super_admin_actlist_going.html.php
	public/tpls/templates_c/917fb1f2dc35c380ba94411c059a62a27dfe44d9.file.infot_edit.html.php
	public/tpls/templates_c/96d3fd1e009976a21de025d195eca89f4cd64a36.file.super_admin_noactlist.html.php
	public/tpls/templates_c/e267dcb32f558d72ef17cc4912eb244743d0dad3.file.super_admin_noactlist_done.html.php
	sys/config/db-cred.inc.php

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

Conflicts:
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/557724488c0d1472f55b9b370819058ffefc6297.file.notice.html.php
	public/tpls/templates_c/73bf2702b43c814ae6c0d9d1857afb4051b4492f.file.week_act_list.html.php
	public/tpls/templates_c/769d1f4b80bebf241f7959fd621ed4334e897eff.file.notice3.html.php
	public/tpls/templates_c/a7916e79428643b39e99c1493974ee1c008cebce.file.team_list.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/b50b7562c6d0bda8d5967293bd62cebc8b3648b0.file.footer.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php

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