fix merge
authorEgor Kislitsyn <egor@kislitsyn.com>
Thu, 31 Jan 2019 08:23:50 +0000 (15:23 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Thu, 31 Jan 2019 08:23:50 +0000 (15:23 +0700)
commit58e250d9d27205116df5634d909ec1e43ea55286
tree5ae4cfdc672e679ae1500b01dbd79f3c2bbb580f
parentd3677d2b4d4d53619777509e0169bb0764213d39
fix merge
lib/pleroma/application.ex