Merge branch 'release'

1aa0dcac · chengye · f8c5bd61 · be74cb47 · 1aa0dcac
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /public/dist2/*
 /public/static/uploads/*
 /public/static/xadmin/*
+/config/*
\ No newline at end of file