sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' into travis/pl_enhancements

Browse Source
This commit is contained in:
Travis Ralston
2017-10-11 08:42:45 -06:00
parent 20798dd2fa ffb9dd844a
commit f874fc1203
53 changed files with 815 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/strings/en_US.json
-1
View File
@@ -262,7 +262,6 @@
"Moderator": "Moderator",
"Must be viewing a room": "Must be viewing a room",
"Mute": "Mute",
"my Matrix ID": "my Matrix ID",
"Name": "Name",
"Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
"Never send encrypted messages to unverified devices in this room": "Never send encrypted messages to unverified devices in this room",