Merge branch 'dev' of https://github.com/mirukana/mirage into dev

2020-05-20 23:40:41 -04:00
parent 4a91b3d09d fc28ffd741
commit e128471628
7 changed files with 84 additions and 40 deletions
--- a/src/backend/user_files.py
+++ b/src/backend/user_files.py
@@ -235,6 +235,7 @@ class UISettings(JSONDataFile):
            "clearRoomFilterOnEscape": True,
            "clearMemberFilterOnEscape": True,
            "collapseSidePanesUnderWindowWidth": 400,
+            "enableKineticScrolling": True,
            "hideProfileChangeEvents": True,
            "hideMembershipEvents": False,
            "hideUnknownEvents": True,