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.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		6 years ago
..
about	…
accounts	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
admin	Merge branch 'master' into glitch-soc/merge	6 years ago
admin_mailer	…
application	…
auth	…
authorize_follows	…
errors	…
follower_accounts	Add preference to hide following/followers lists (#7532)	6 years ago
following_accounts	Add preference to hide following/followers lists (#7532)	6 years ago
home	…
invites	…
kaminari	…
layouts	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_unfollows	…
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
shared	…
shares	…
stream_entries	…
tags	…
user_mailer	…
well_known	…