Merge branch 'master' into refactor-repo

2017-11-04 18:40:53 +01:00
parent 2d22e9cabe b0eadadc5c
commit edbea372e9
4 changed files with 28 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,15 @@
 *.pyc
 *.mo
 __pycache__
-/core/admin/lib
+pip-selfcheck.json
+/core/admin/lib*
 /core/admin/bin
 /core/admin/include
-pip-selfcheck.json
+/docs/lib*
+/docs/bin
+/docs/include
+/docs/_build
 /.env
-/data
-/docker-compose.mac.yml
 /docker-compose.yml
 /.idea
 /.vscode