Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
about	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
admin_mailer
application	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
authorize_interactions
directories	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
media	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
notification_mailer
oauth
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
relationships
remote_follow
remote_interaction
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
shared
shares
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
tags	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-20 16:45:40 +02:00
user_mailer	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
well_known/host_meta