Merge commit 'bb5374a0eba3ab6593e0ef0139f776e586ad867d' into fluffychat-merge

4 months ago · d79daee47f
parent c67f779063 bb5374a0eb
commit d79daee47f
2 changed files with 1 additions and 1 deletions
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@ -670,6 +670,7 @@ class ChatController extends State<ChatPageWithRoom>
    }
    // Pangea#
    if (state != AppLifecycleState.resumed) return;
    if (!mounted) return;
    setReadMarker();
  }
--- a/web/index.html
+++ b/web/index.html
@ -46,7 +46,6 @@
  <!-- This script adds the flutter initialization JS code -->
  <script src="flutter.js" defer></script>
  <script src="assets/assets/js/package/olm.js"></script>
 </head>
 <body>