Merge branch 'release/0.12.0'

Kruptein · Dec 23, 2018 · 22bdfb4 · 22bdfb4
2 parents 79e168c + ffe2b25
commit 22bdfb4
Show file tree

Hide file tree

Showing 208 changed files with 17,604 additions and 89,246 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-PlanarAlly/static/js/*.js linguist-generated=true
+server/static/js/*.js linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -3,28 +3,27 @@
 .vscode/**
 
 # Python
-env/**
-**/__pycache__/**
-venv
+server/env/**
+server/**/__pycache__/**
+server/venv
 .mypy**
 
 # PyInstaller
-dist/**
-build/**
+server/dist/**
+server/build/**
 
 # JS
-.cache-loader/**
-node_modules/**
-PlanarAlly/client/src/*.js
-PlanarAlly/client/src/*.js.map
+client/node_modules/**
+server/client/src/*.js
+sever/client/src/*.js.map
 
 # PlanarAlly
-planarallyserver.log
-planar.save*
-planar.sqlite
-server_config.cfg
-PlanarAlly/static/img/**
-PlanarAlly/static/assets/**
+server/planarallyserver.log
+server/planar.save*
+server/planar.sqlite
+server/server_config.cfg
+server/static/img/**
+server/static/assets/**
 
 # docs
 docs/_build
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PlanarAlly/static/js/*.js linguist-generated=true
		server/static/js/*.js linguist-generated=true