Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
parent f0bb3ff533 f890d2a766
commit eb39db7f93
82 changed files with 753 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ addons:
      - yarn

 rvm:
-  - 2.4.2
+  - 2.4.3
  - 2.5.0

 services: