Merge remote-tracking branch 'drwetter/2.9dev' into 2.9dev

This commit is contained in:
AlGreed 2016-11-04 03:05:37 +01:00
parent 175ead6d2a
commit ebc1f691b9
1 changed files with 4 additions and 0 deletions

4
.gitignore vendored
View File

@ -1,3 +1,7 @@
.DS_Store .DS_Store
tmp.json tmp.json
*.bak *.bak
*.xml
*.iml