Merge remote-tracking branch 'origin/feature/beta-2'

robert7 · Aug 17, 2018 · 6c2c5b9 · 6c2c5b9
2 parents e263e3b + bd0c25f
commit 6c2c5b9
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 3 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/development/README.md b/development/README.md
@@ -1,3 +1 @@
-some development only helpers/shortcuts
-
-temporary/not yet really finished
+Development only helpers/shortcuts.