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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		6 years ago
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	Fix low-hanging rubocop gripes (#8458)	6 years ago
emojis.rake	…
glitchsoc.rake	…
mastodon.rake	Fix low-hanging rubocop gripes (#8458)	6 years ago
statistics.rake	…