merge master

gusibi · gusibi · commit 3b64d1215d4b · 2018-06-28T11:14:37.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -107,6 +107,4 @@ pip-selfcheck.json
 *.swp
 example-app
 
-.DS_Store
-
 # End of https://www.gitignore.io/api/python
