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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 8c0e0575620b7ed8cc022d717dae97dddc41f243,0697da1a307ba3f4a0fdd6ff43a176392e4864cf..3737f2299a93468a052e71bd72d470a30e827f63
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -254,11 -254,8 +254,10 @@@ GE
      hashie (3.5.7)
      heapy (0.1.4)
      highline (2.0.0)
-     hiredis (0.6.1)
-     hitimes (1.3.0)
+     hiredis (0.6.3)
      hkdf (0.3.0)
 +    html2text (0.2.1)
 +      nokogiri (~> 1.6)
      htmlentities (4.3.4)
      http (3.3.0)
        addressable (~> 2.3)

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge