Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-14 09:17:23 +00:00
parent d66192f21c 85ab30abf7
commit e3d0d72b29
8 changed files with 177 additions and 25 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -114,6 +114,15 @@
    ],
    "path": "app/javascript/mastodon/components/domain.json"
  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Load more",
+        "id": "status.load_more"
+      }
+    ],
+    "path": "app/javascript/mastodon/components/load_gap.json"
+  },
  {
    "descriptors": [
      {