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.

Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.		4 years ago
..
assets.rake	Override current_user when generating static pages	5 years ago
auto_annotate_models.rake	Add announcements (#12662)	4 years ago
db.rake	Deal with collation-related index corruption (#14860)	4 years ago
emojis.rake	Add border around 🕺 emoji (#14769)	4 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	6 years ago
mastodon.rake	Fix mastodon:setup choking on env variables containing '%' (#13940)	4 years ago
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	5 years ago
statistics.rake	add task to report code statistics (#2489)	7 years ago