Merge branch 'feature/scrobbling' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 10:45:00 +0000 (10:45 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 10:45:00 +0000 (10:45 +0000)
commited176e74027d5a48247bafebc916932b931f56ab
treeea90c3aa50c91d3c92715a278f4aa938466e1317
parent90537f398160eddfb8033c1cdfe1acc21ee63c4a
parent1d7cbdaf7b2f3ff6576959ed26885d7545f31a14
Merge branch 'feature/scrobbling' into 'develop'

media scrobbling ("now playing" API)

See merge request pleroma/pleroma!1732