Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 8 Apr 2018 06:02:11 +0000 (06:02 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 8 Apr 2018 06:02:11 +0000 (06:02 +0000)
commit9998b4519da0a732d2a91ca067f4f849a0d37be6
treef29460d280dad1d0e314b21b211c5717e575006c
parent9a2d3705c69ed4acd97d423013d29f8d5d608f94
parent1857f403bea8d16f95a3b1ae46e07e2acd807c3c
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'

mastodon api emulation improvements for tootstream

Closes #101

See merge request pleroma/pleroma!100
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex