Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
activitypub
admin
api
auth
concerns
oauth
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
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	Restful refactor of accounts/ routes (#2133)	2017-04-19 13:52:37 +02:00
accounts_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
application_controller.rb
authorize_follows_controller.rb
emojis_controller.rb	Cache JSON of immutable ActivityPub representations (#6171)	2018-01-04 01:21:38 +01:00
follower_accounts_controller.rb
following_accounts_controller.rb
home_controller.rb
intents_controller.rb	Add protocol handler. Handle follow intents (#4511)	2017-08-14 04:53:31 +02:00
invites_controller.rb
manifests_controller.rb	Make Chrome splash screen same color as web UI's background color (#5169)	2017-10-02 01:23:32 +02:00
media_controller.rb	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
media_proxy_controller.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
remote_follow_controller.rb
remote_unfollows.rb	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	2018-04-08 13:40:22 +02:00
shares_controller.rb
statuses_controller.rb
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
tags_controller.rb