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 e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.		5 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin_mailer	…
application	Fix lock icon not being shown when locking account in profile settings (#14190)	5 years ago
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
media	Add color extraction for audio thumbnails (#14209)	5 years ago
notification_mailer	…
oauth	…
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	…
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
user_mailer	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
well_known/host_meta	…