Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 21 Dec 2019 17:37:29 +0000 (20:37 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 21 Dec 2019 17:38:59 +0000 (20:38 +0300)
commit54c9db38c8035ecc115e136a09a3d991e426959a
tree496afddf614e826c2c76c7d69e3968a3c118e717
parent67cb46e15dd5fa16da257a9b0e5166266d10c694
parentc51e93978ea2aa0f2d5bcc43bf7c925b2590eece
Merge branch 'develop' into issue/1383
config/config.exs
config/test.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex