Merge remote-tracking branch 'origin/develop' into reactions
authorlain <lain@soykaf.club>
Mon, 7 Oct 2019 10:30:59 +0000 (12:30 +0200)
committerlain <lain@soykaf.club>
Mon, 7 Oct 2019 10:30:59 +0000 (12:30 +0200)
commit73b6512907d205d4be49864541eeb941d259aa57
tree8441ec250a7e7681b12bdc756df46a9870793149
parent91e90aa807c2ce346cd453201447806fb71b21fe
parent93bdc55306895dce0554e7838ecf2ea7ddaea3a7
Merge remote-tracking branch 'origin/develop' into reactions
CHANGELOG.md
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
lib/pleroma/web/router.ex