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 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
confirmations_controller.rb	…
omniauth_callbacks_controller.rb	…
passwords_controller.rb	…
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
sessions_controller.rb	…