Merge branch 'master' into glitch-soc/merge-upstream

2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1254,6 +1254,10 @@
        "defaultMessage": "to mention author",
        "id": "keyboard_shortcuts.mention"
      },
+      {
+        "defaultMessage": "to open author's profile",
+        "id": "keyboard_shortcuts.profile"
+      },
      {
        "defaultMessage": "to favourite",
        "id": "keyboard_shortcuts.favourite"