mastodon/app
Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
mailers Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2021-01-11 11:55:42 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00