Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 3 Feb 2020 18:42:36 +0000 (21:42 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 3 Feb 2020 18:42:36 +0000 (21:42 +0300)
1  2 
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex

Simple merge
Simple merge
Simple merge