mastodon/lib/tasks
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
..
assets.rake
auto_annotate_models.rake Add announcements (#12662) 2020-01-23 22:00:13 +01:00
db.rake Fix typo in db.rake (#16126) 2021-04-27 16:25:24 +02:00
emojis.rake Update emoji codepoint mappings to v13.1 (#16352) 2021-06-03 16:08:07 +02:00
glitchsoc.rake
mastodon.rake Change mastodon:setup to not call assets:precompile in docker (#13942) 2021-03-24 10:37:24 +01:00
repo.rake Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
statistics.rake