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 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		6 years ago
..
activitypub	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
concerns	…
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	Allow turning keybase off instance-wide	6 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	…
application_controller.rb	…
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
public_timelines_controller.rb	…
relationships_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
stream_entries_controller.rb	…
tags_controller.rb	…