Merge branch 'develop' of https://github.com/vector-im/riot-web into develop

Conflicts: src/i18n/strings/eo.json
2018-02-01 10:24:21 +00:00
parent a26473b722 0d229f015b
commit a6155c98ec
47 changed files with 261 additions and 131 deletions
@@ -1,6 +1,6 @@
 {
    "All messages": "全ての発言",
-    "All messages (loud)": "全ての発言(通知音あり)",
+    "All messages (noisy)": "全ての発言(通知音あり)",
    "Cancel": "取消",
    "Close": "閉じる",
    "Direct Chat": "対話",