mastodon/app/controllers
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
2018-01-02 00:11:41 -06:00
..
activitypub
admin
api
auth
concerns Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
oauth
settings
well_known
about_controller.rb
account_follow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb
accounts_controller.rb filter local-only statuses from public pages 2017-12-10 17:23:01 -06:00
application_controller.rb
authorize_follows_controller.rb
emojis_controller.rb
follower_accounts_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
following_accounts_controller.rb
home_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
remote_follow_controller.rb
shares_controller.rb
statuses_controller.rb
stream_entries_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
tags_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00