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
..
activitypub	Fix nil error in focal_point? (#6537)	2018-02-22 17:42:33 +01:00
rest	…
web	…
initial_state_serializer.rb	…
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…