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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
v1	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
web	Keep WebPush settings (#5879)	7 years ago
base_controller_spec.rb	Fix webfinger retries (#4275)	7 years ago
oembed_controller_spec.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
push_controller_spec.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	7 years ago
salmon_controller_spec.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller_spec.rb	Hook up URL-based resource look-up to ActivityPub (#4589)	7 years ago