Iterate design and fix post-merge conflict

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-10-07 10:36:45 +01:00
parent c784039cf6
commit 29e3881fb3
5 changed files with 25 additions and 10 deletions

View file

@ -1273,7 +1273,7 @@
"Yours, or the other users session": "Yours, or the other users session",
"Members": "Members",
"Room Info": "Room Info",
"You can't view pinned widgets in the right panel": "You can't view pinned widgets in the right panel",
"Unpin a widget to view it in this panel": "Unpin a widget to view it in this panel",
"Unpin": "Unpin",
"Options": "Options",
"Widgets": "Widgets",