Merge branch 'develop' into feature/relay-list
authorMaxim Filippov <colixer@gmail.com>
Fri, 18 Oct 2019 16:35:58 +0000 (18:35 +0200)
committerMaxim Filippov <colixer@gmail.com>
Fri, 18 Oct 2019 16:35:58 +0000 (18:35 +0200)
commit019147f1153f0df844997c04c31753c18a22509f
tree4086ddbb3c92cd0439a973ec6f59bb2c0c758c4c
parent2473702be22a44070fcff439ac901f5b9bb0586a
parent4053a82f41691195d1b29cc9eb3f6ed6814ee12f
Merge branch 'develop' into feature/relay-list
CHANGELOG.md
lib/pleroma/web/router.ex