Merge branch 'mueller/master'

This commit is contained in:
Robin Müller 2020-12-17 18:20:16 +01:00
commit 34760becb9

2
.gitignore vendored
View File

@ -3,3 +3,5 @@ log
.idea/* .idea/*
!.idea/runConfigurations !.idea/runConfigurations
*.json