Merge remote-tracking branch 'drwetter/2.9dev' into 2.9dev
This commit is contained in:
parent
175ead6d2a
commit
ebc1f691b9
|
@ -1,3 +1,7 @@
|
|||
.DS_Store
|
||||
tmp.json
|
||||
*.bak
|
||||
|
||||
*.xml
|
||||
|
||||
*.iml
|
||||
|
|
Loading…
Reference in New Issue