Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Dec 2019 16:52:46 +0000 (19:52 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Dec 2019 16:52:46 +0000 (19:52 +0300)
commit5876a9cb79e53f932d63e457610852031669a222
tree6ff7335e9ddd5cfbce1e33ca075265c6f31b8b61
parent3c3bba0b7c65187b3270ef3402442cf870a55198
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e
Merge branch 'develop' into issue/1383
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex
mix.exs
mix.lock
test/support/helpers.ex