Merge tag 'v2.0.0' into gs-master

diff --cc app/javascript/mastodon/components/status_content.js
Simple merge

diff --cc app/javascript/styles/application.scss
index e35937be133d455344b28788a479a66e86ad774c,44aa105645a01ca1fead9776442255cfadd14e4e..efd34393f6dca38d80d498fcd313ec3ac9a161b4
--- 1/app/javascript/styles/application.scss
--- 2/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@@ -1,20 -1,22 +1,23 @@@
- @import 'mixins';
- @import 'variables';
+ @import 'mastodon/mixins';
+ @import 'mastodon/variables';
 +@import 'variables-glitch';
+ @import 'fonts/roboto';
+ @import 'fonts/roboto-mono';
+ @import 'fonts/montserrat';
  
- @import 'reset';
- @import 'basics';
- @import 'containers';
- @import 'lists';
- @import 'footer';
- @import 'compact_header';
- @import 'landing_strip';
- @import 'forms';
- @import 'accounts';
- @import 'stream_entries';
- @import 'components';
- @import 'emoji_picker';
- @import 'about';
- @import 'tables';
- @import 'admin';
- @import 'rtl';
+ @import 'mastodon/reset';
+ @import 'mastodon/basics';
+ @import 'mastodon/containers';
+ @import 'mastodon/lists';
+ @import 'mastodon/footer';
+ @import 'mastodon/compact_header';
+ @import 'mastodon/landing_strip';
+ @import 'mastodon/forms';
+ @import 'mastodon/accounts';
+ @import 'mastodon/stream_entries';
+ @import 'mastodon/components';
+ @import 'mastodon/emoji_picker';
+ @import 'mastodon/about';
+ @import 'mastodon/tables';
+ @import 'mastodon/admin';
+ @import 'mastodon/rtl';

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

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

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

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

diff --cc app/javascript/styles/mastodon/components.scss
index 119e9feb06ace03a666c1ca2494d5e802f947547,5211489f7a190eb851248ea8ae7eb9c4b80e8168..6fe17958136af73c6cacb2b3b960d6e03eddf2b4
--- 1/app/javascript/styles/components.scss
--- 2/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@@ -528,29 -502,23 +528,37 @@@
    cursor: pointer;
  }
  
 +.status-check-box {
 +  .status__content,
 +  .reply-indicator__content {
 +    color: #3a3a3a;
 +    a {
 +      color: #005aa9;
 +    }
 +  }
 +}
 +
  .status__content,
  .reply-indicator__content {
 +  position: relative;
 +  margin: 10px 0;
 +  padding: 0 12px;
    font-size: 15px;
    line-height: 20px;
 +  color: $primary-text-color;
    word-wrap: break-word;
    font-weight: 400;
 -  overflow: hidden;
 +  overflow: visible;
    white-space: pre-wrap;
  
+   &.status__content--with-spoiler {
+     white-space: normal;
+ 
+     .status__content__text {
+       white-space: pre-wrap;
+     }
+   }
+ 
    .emojione {
      width: 18px;
      height: 18px;

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

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

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc config/application.rb
Simple merge

diff --cc package.json
Simple merge