Merge branch 'develop' into element

This commit is contained in:
Travis Ralston 2020-07-14 15:04:17 -06:00
commit 322d58ba0c
3 changed files with 2 additions and 9 deletions

View file

@ -486,7 +486,6 @@
"You changed the room topic": "You changed the room topic",
"%(senderName)s changed the room topic": "%(senderName)s changed the room topic",
"New spinner design": "New spinner design",
"Font scaling": "Font scaling",
"Message Pinning": "Message Pinning",
"Custom user status messages": "Custom user status messages",
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",