Merge branch 'release'

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