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 cd99255698 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		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
repo.rake	using mailto scheme in AUTHORS.md (#8663)	6 years ago
statistics.rake	…