Merge branch 'develop' into admin-be
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 14 Jan 2020 11:52:00 +0000 (14:52 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 14 Jan 2020 11:52:00 +0000 (14:52 +0300)
commit70c7a26de8135ddc089fc0d2e0766e2e793d505c
tree6c9745a08d5708bc73738679a2fe6857be6ed306
parent1630ecaa20894c6e18b83ce1a830184d577150c3
parent12b28c8925c2c55e0d7bb66ff3320532a1aade3b
Merge branch 'develop' into admin-be
config/config.exs
config/description.exs
lib/pleroma/web/router.ex