Merge branch 'master' into 'dev'

# Conflicts: # composer.json

Merge branch 'master' into 'dev'
# Conflicts: # composer.json
02831b88 · Henning Leutz · 85e6a263 · 79bc953c · 02831b88
Commit 02831b88 erstellt vor 3 Jahren von Henning Leutz
--- a/composer.json
+++ b/composer.json
@@ -25,4 +25,4 @@
            "QUI\\Pace\\": "src\/QUI\/Pace"
        }
    }
-}
+}
\ No newline at end of file