merge fix
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 20 Jan 2020 15:25:00 +0000 (18:25 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 20 Jan 2020 15:25:00 +0000 (18:25 +0300)
commit8023fa48dbc68fe696337a4da940b95fd209e304
tree432600b7446f65e05fb4bbe2994c7369b82c79f0
parentefb8ef5abee1a8defa2bfba40ad1065db4c09ddf
merge fix
lib/pleroma/config/config_db.ex
lib/pleroma/web/admin_api/admin_api_controller.ex