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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
accounts	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin_mailer	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	5 years ago
application	Fix user preference to show trends not working on public pages (#11740)	5 years ago
auth	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
errors	Fix uncaught parameter missing exceptions and missing error templates (#11702)	5 years ago
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
media	…
notification_mailer	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	5 years ago
oauth	…
public_timelines	…
relationships	…
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	…
user_mailer	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
well_known/host_meta	…