Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 9 Dec 2019 16:41:43 +0000 (19:41 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 9 Dec 2019 16:41:43 +0000 (19:41 +0300)
commit2b821036c4bd84cee51c9fcace5a4b3764c3bba1
tree811d75ef4b0442f3f2102d873fab4e10c777e7f1
parent5876a9cb79e53f932d63e457610852031669a222
parent0d2c13a119302d0d217a7cb61c28a01c620b1b61
Merge branch 'develop' into issue/1383
lib/pleroma/application.ex