Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit

2017-07-17 17:23:02 +01:00
parent 6f65128928 ee5117525c
commit 7041106bf2
44 changed files with 363 additions and 203 deletions
@@ -956,5 +956,6 @@
    "Featured Rooms:": "Featured Rooms:",
    "Error whilst fetching joined groups": "Error whilst fetching joined groups",
    "Featured Users:": "Featured Users:",
-    "Edit Group": "Edit Group"
+    "Edit Group": "Edit Group",
+    "Automatically replace plain text Emoji": "Automatically replace plain text Emoji"
 }