Merge remote-tracking branch 'upstream/indev' into dynamic-grid

static/css/game.css

@@ -19,9 +19,13 @@
     border-right: none;
     border-bottom: none;
     height: min-content;
+<<<<<<< HEAD
     width: 100%;
     min-width: 32rem;
     max-width: 44rem;
+=======
+    min-width: 500px;
+>>>>>>> upstream/indev
 }
 
 .header {

the_prestige.py

@@ -1121,7 +1121,7 @@ async def game_watcher():
             this_array = gamesarray.copy()
             for i in range(0,len(this_array)):
                 game, channel, user, key = this_array[i]
-                if game.over and main_controller.master_games_dic[key][1]["end_delay"] <= 9:                   
+                if game.over and main_controller.master_games_dic[key][1]["end_delay"] <= 8:                   
                     final_embed = game_over_embed(game)
                     if isinstance(user, str):
                         await channel.send(f"A game started by {user} just ended.")