Merge remote-tracking branch 'origin/dev'

tomvandeneede · Jul 14, 2019 · 5f2fbb8 · 5f2fbb8
2 parents 2f7eb1c + e90480b
commit 5f2fbb8
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/.idea/dictionaries/Tim.xml b/.idea/dictionaries/Tim.xml