Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
authorlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Apr 2019 12:10:51 +0000 (14:10 +0200)
commita9f805c87100fd2ee1d8426460b81af4a235d574
tree70179175f0ff84f3f4c7399f63694766aaa65b35
parent5d871173d189a0019fda0ee76f8a324d90a163ee
parent4977e96fa408e8148a355b3c759af34ae3ca312d
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
lib/pleroma/web/router.ex
test/web/mastodon_api/mastodon_api_controller_test.exs