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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
accounts	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
admin_mailer	…
application	…
auth	…
authorize_interactions	…
directories	…
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
tags	…
user_mailer	…
well_known/host_meta	…