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	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-04 23:17:11 +00:00
web
initial_state_serializer.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
manifest_serializer.rb	implement web share target (#6278)	2018-01-17 17:08:10 +01:00
oembed_serializer.rb
webfinger_serializer.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00