Merge branch 'hotfix/new-hotfix' into develop
feature
Merge branch 'feature/new-feature' into develop
Merge branch 'develop' of https://github.com/benjaminblasius/git-flow