Merge branch 'develop' into new-guest-access

This commit is contained in:
David Baker 2017-06-06 10:33:01 +01:00
commit f8198ba9c9
4 changed files with 12 additions and 3 deletions

View file

@ -241,6 +241,7 @@
"Direct chats": "Direct chats",
"disabled": "disabled",
"Disable inline URL previews by default": "Disable inline URL previews by default",
"Disable markdown formatting": "Disable markdown formatting",
"Disinvite": "Disinvite",
"Display name": "Display name",
"Displays action": "Displays action",