Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma...
authorlain <lain@soykaf.club>
Thu, 3 Sep 2020 09:29:39 +0000 (11:29 +0200)
committerlain <lain@soykaf.club>
Thu, 3 Sep 2020 09:29:39 +0000 (11:29 +0200)
commitf26b580e80e57f162442e6f0c3bc0072cb935ce3
tree3aad914a705da3574c3924c7dc6915965c2e3ad7
parent0a9c63fb4351ed29a521697f2c584b0ae007696c
parentd1a6f67b1d92e17f4fe3cfc8f296879326897220
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
lib/mix/tasks/pleroma/frontend.ex