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.		2018-09-11 16:51:26 +02:00
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
emojis.rake	…
glitchsoc.rake	…
mastodon.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
repo.rake	using mailto scheme in AUTHORS.md (#8663)	2018-09-10 02:01:03 +02:00
statistics.rake	…