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 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		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	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
application	Add profile directory to web UI (#11688)	5 years ago
auth	…
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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
invites	Add invite comments (#10465)	5 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
media	…
notification_mailer	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
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	Fix error in warning e-mail template (#11698)	5 years ago
well_known/host_meta	…