Merge branch 'develop' into 'reactions'
authorlain <lain@soykaf.club>
Mon, 7 Oct 2019 12:31:51 +0000 (12:31 +0000)
committerlain <lain@soykaf.club>
Mon, 7 Oct 2019 12:31:51 +0000 (12:31 +0000)
commit6c278cfe09fb9fd5220743d8f69c6e232623a09b
tree93f1716551e6677193b05f33583579e68ad512c2
parente8395bedd2164723b641e1e28cf08e40875893bf
parent0a99f1e8c5551dcf170722e5087a0401b2d907af
Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/router.ex