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)
1  2 
config/config.exs
config/description.exs
lib/pleroma/web/router.ex

Simple merge
Simple merge
Simple merge