Signed-off-by: LitLeo <952703773@qq.com>
Merge branch 'master' of github.com:Linked-Destiny/Kindergarden

Conflicts:
	config.inc.php
Merge branch 'master' of github.com:Linked-Destiny/Kindergarden

Conflicts:
	config.inc.php

Signed-off-by: LitLeo <952703773@qq.com>