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	Fixed not being able to display review pending hashtags in the admin UI. (#11875)	2019-09-17 16:59:16 +02:00
application	Fix user preference to show trends not working on public pages (#11740)	2019-09-03 04:57:07 +02:00
auth	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
errors	Fix uncaught parameter missing exceptions and missing error templates (#11702)	2019-08-30 01:34:47 +02:00
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	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	2019-09-05 06:14:30 +02:00
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	Change OpenGraph description on sign-up page to reflect invite (#11744)	2019-09-03 04:56:54 +02:00
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
tags	…
user_mailer	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
well_known/host_meta	…