Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
authorlain <lain@soykaf.club>
Fri, 17 May 2019 09:33:04 +0000 (11:33 +0200)
committerlain <lain@soykaf.club>
Fri, 17 May 2019 09:33:04 +0000 (11:33 +0200)
commit67af50ec713d46e6e1d72605b985858cc15aad3c
tree044e9f4235fbcbe7985ea36a98558bac05b0ae42
parente39c190f046bb345e80a2195278bb59ac81b8002
parent3e5301ad5cf3d9805c0dc9ea8440992de160330b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
config/config.exs
mix.exs
mix.lock