Merge branch 'master' into espy-gitignore

2018-05-22 22:48:08 +02:00
parent 8201f2c3c4 557879451c
commit f03ac6dd68
16 changed files with 557 additions and 342 deletions
@@ -109,22 +109,4 @@ venv.bak/
 .mypy_cache/

 /src/config/Config.json
-/src/config/PrivateConfig.json
-
-# IntelliJ stuff
-.idea/
-*.iml
-
-# Sublime stuff
-# Cache files for Sublime Text
-*.tmlanguage.cache
-*.tmPreferences.cache
-*.stTheme.cache
-
-# Workspace files are user-specific
-*.sublime-workspace
-
-# Project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using Sublime Text
-# *.sublime-project
-
+/src/config/PrivateConfig.json