Commit 3da4c57a authored by Dennis Willers's avatar Dennis Willers 🏀

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/app.module.ts
#	src/app/select-game/select-game.component.html
parents 7c37a2d1 db0b9168
Pipeline #279 passed with stages
in 5 minutes and 15 seconds