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 c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.		5 years ago
..
about	…
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	…
auth	…
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
errors	…
filters	Various fixes and improvements (#12878)	5 years ago
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/master	5 years ago
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
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/master	5 years ago
tags	…
user_mailer	…
well_known/host_meta	…