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

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

app/javascript/mastodon/locales/defaultMessages.json

@@ -610,6 +610,10 @@
         "defaultMessage": "Edit profile",
         "id": "account.edit_profile"
       },
+      {
+        "defaultMessage": "Ownership of this link was checked on {date}",
+        "id": "account.link_verified_on"
+      },
       {
         "defaultMessage": "Follows you",
         "id": "account.follows_you"
@@ -1834,6 +1838,15 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Toot",
+        "id": "compose_form.publish"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/columns_area.json"
+  },
   {
     "descriptors": [
       {