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

2017-06-02 11:36:43 +00:00
parent 5a41c4396e 57a368b8f0
commit bbd3c14089
4 changed files with 39 additions and 23 deletions
@@ -141,6 +141,7 @@
  "Camera": "Camera",
  "Advanced": "Advanced",
  "Algorithm": "Algorithm",
+  "Hide removed messages": "Hide removed messages",
  "Always show message timestamps": "Always show message timestamps",
  "Authentication": "Authentication",
  "all room members": "all room members",