This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2018-02-23 23:28:31 +09:00
..
v1	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
web	Keep WebPush settings (#5879)	2017-12-09 02:31:37 +01:00
base_controller_spec.rb	…
oembed_controller_spec.rb	…
push_controller_spec.rb	…
salmon_controller_spec.rb	Fix response of signature_verification_failure_reason (#6441)	2018-02-08 05:00:45 +01:00
subscriptions_controller_spec.rb	…