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 f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
assets.rake	…
auto_annotate_models.rake	Add announcements (#12662)	5 years ago
db.rake	Fix post-migration warning about index corruption being too scary (#15223)	4 years ago
emojis.rake	Add border around 🕺 emoji (#14769)	4 years ago
glitchsoc.rake	…
mastodon.rake	Fix mastodon:setup choking on env variables containing '%' (#13940)	5 years ago
repo.rake	…
statistics.rake	…