mastodon/app
Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
2021-07-13 17:57:15 +02:00
..
chewy Change `tootctl search deploy` algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
mailers Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-06-24 08:08:02 +02:00