OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity
mastodon/app/controllers
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
 		2019-07-23 10:51:07 +02:00
..
activitypub
…
admin
…
api Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
concerns
…
oauth Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
well_known
…
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
account_follow_controller.rb
…
account_unfollow_controller.rb
…
accounts_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
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
…
instance_actors_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
…
shares_controller.rb
…
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
tags_controller.rb
…