Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout

This commit is contained in:
Travis Ralston 2020-06-05 08:39:19 -06:00
commit b31a8d494b
3 changed files with 6 additions and 11 deletions

View file

@ -1134,6 +1134,9 @@
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
"Not now": "Not now",
"Don't ask me again": "Don't ask me again",
"Jump to first unread room.": "Jump to first unread room.",
"Jump to first invite.": "Jump to first invite.",
"Add room": "Add room",
"Show %(n)s more": "Show %(n)s more",
"Options": "Options",
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",