Merge branch 'show-media-endpoint-fixes' into 'develop'
authorlain <lain@soykaf.club>
Mon, 18 May 2020 10:57:59 +0000 (10:57 +0000)
committerlain <lain@soykaf.club>
Mon, 18 May 2020 10:57:59 +0000 (10:57 +0000)
commit96f7b1b140979249cf28bc742b7749f1bee7ea9c
tree8d5180737211a96dc066372c640864c60c5a4f0f
parent1199cf3a788334cd3fdb968d9f736e43c1401da1
parent9b765652649f8b6110bd70aa90b148a90057ff6a
Merge branch 'show-media-endpoint-fixes' into 'develop'

MediaController OAuth scope assignments fix

See merge request pleroma/pleroma!2541