This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
devise	…
generators	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
templates	…
cli.rb	…