You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
activitypub	Federate pinned statuses over ActivityPub (#6610)	7 years ago
admin	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
api	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
auth	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
concerns	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
oauth	change pack to 'auth'	7 years ago
settings	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
well_known	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)	7 years ago
about_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
application_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
authorize_follows_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
emojis_controller.rb	Cache JSON of immutable ActivityPub representations (#6171)	7 years ago
follower_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
following_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
home_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
intents_controller.rb	…
invites_controller.rb	Use settings pack for InvitesController (#229)	7 years ago
manifests_controller.rb	…
media_controller.rb	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
media_proxy_controller.rb	…
remote_follow_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
remote_unfollows.rb	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	7 years ago
shares_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
statuses_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
tags_controller.rb	Finalized theme loading and stuff	7 years ago