You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	Fix typo in db.rake (#16126)	4 years ago
emojis.rake	Update emoji codepoint mappings to v13.1 (#16352)	4 years ago
glitchsoc.rake	…
mastodon.rake	Change mastodon:setup to not call assets:precompile in docker (#13942)	4 years ago
repo.rake	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
statistics.rake	…