mastodon/app/controllers
Thibaut Girka e71b16ae2b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
2020-11-25 15:31:45 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2020-11-25 15:31:45 +01:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
well_known Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
application_controller.rb
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
emojis_controller.rb
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
following_accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
home_controller.rb
instance_actors_controller.rb Add outbox attribute to instance actor (#14721) 2020-09-02 18:42:50 +02:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb Fix embedded player 2020-08-12 00:00:42 +02:00
media_proxy_controller.rb
public_timelines_controller.rb
relationships_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_controller.rb
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-08 16:26:47 +02:00