Even Malm Nordgaard requested to merge GameActivityBranch into main Apr 24, 2023

Merge branch 'GameActivityBranch' of https://gitlab.stud.idi.ntnu.no/tdt4240-g16/shoutout-android into GameActivityBranch

Conflicts:

app/src/main/java/ntnu/tdt4240/shoutout/GameActivity.java