Merge tag 'v2.6.5' into instance_only_statuses

2018-12-07 15:27:23 +01:00
parent b9f0f794db 887f9de6dc
commit f5f9fc366d
298 changed files with 2754 additions and 1673 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@ -901,6 +901,14 @@
  },
  {
    "descriptors": [
+      {
+        "defaultMessage": "Dismiss suggestion",
+        "id": "suggestions.dismiss"
+      },
+      {
+        "defaultMessage": "You might be interested in…",
+        "id": "suggestions.header"
+      },
      {
        "defaultMessage": "People",
        "id": "search_results.accounts"
@ -1076,15 +1084,6 @@
    ],
    "path": "app/javascript/mastodon/features/compose/index.json"
  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Last message:",
-        "id": "conversation.last_message"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/direct_timeline/components/conversation.json"
-  },
  {
    "descriptors": [
      {