Merge pull request #525 from ThibG/glitch-soc/merge-upstream

.env.production.sample

.eslintrc.yml

app/controllers/api/v1/timelines/direct_controller.rb

app/controllers/api/v1/trends_controller.rb

app/controllers/api/v2/search_controller.rb

app/javascript/mastodon/actions/search.js

app/javascript/mastodon/actions/trends.js

app/javascript/mastodon/components/scrollable_list.js

app/javascript/mastodon/components/status_list.js

app/javascript/mastodon/features/community_timeline/index.js

...pt/mastodon/features/compose/components/search_results.js

...n/features/compose/containers/search_results_container.js

app/javascript/mastodon/features/compose/index.js

app/javascript/mastodon/features/public_timeline/index.js

app/javascript/mastodon/features/status/index.js

app/javascript/mastodon/reducers/index.js

app/javascript/mastodon/reducers/search.js

app/javascript/mastodon/reducers/trends.js

app/javascript/mastodon/service_worker/entry.js

app/javascript/styles/mastodon-light/diff.scss