Merge branch 'feature/lists' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 24 May 2018 20:22:43 +0000 (20:22 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 24 May 2018 20:22:43 +0000 (20:22 +0000)
commitf3a71f2986fc0787c03bec786e772353e99ae9f9
treeee918da7bd09ba9c1082158ab8b8f1a0337553ba
parentc2dcd767cf4abaa88da946e12ca643840b65e184
parent3dbd9809d44297c2edc8e08bde33f9ef7b998412
Merge branch 'feature/lists' into 'develop'

Mastodon List API

See merge request pleroma/pleroma!138
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs