Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 28 Nov 2019 18:26:56 +0000 (21:26 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 28 Nov 2019 18:27:01 +0000 (21:27 +0300)
commitb7c449118bc09ab36610e85292d153ace67c2b89
tree1b00c2dec9d233ec3aaefd699aee3f4080f68119
parent1403a1441de36e8a58da5e996c208a9c10f65440
parentca1acfa314a57f78c2f5f8e60a4bd1380350e483
Merge branch 'develop' into issue/1383
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex
mix.exs
mix.lock