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 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Add description meta tag additionally to og:description (#8941)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	…
auth	Fix td instead of th in sessions table header (#9162)	6 years ago
authorize_interactions	…
errors	…
filters	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
follower_accounts	…
following_accounts	…
home	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_interaction	…
remote_unfollows	…
settings	move some constants to rails environment	6 years ago
shared	Add description meta tag additionally to og:description (#8941)	6 years ago
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…