Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

activitypub

…

admin

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

auth

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

concerns

…

oauth

…

settings

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-04 16:37:26 +02:00

well_known

Allow turning keybase off instance-wide

2019-04-19 00:57:39 +02:00

about_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-10 09:16:08 +02:00

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

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

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

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

statuses_controller.rb

…

stream_entries_controller.rb

…

tags_controller.rb

…