Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Mon, 2 Apr 2018 11:15:38 +0000 (13:15 +0200)
committerlain <lain@soykaf.club>
Mon, 2 Apr 2018 11:15:38 +0000 (13:15 +0200)
commitcd543d58a1b8ddf0f41a39800dc7a18321cd3250
tree3bafc7d6c40258d1dc56c7539c8e11c25e9f1e22
parent0a14d155d6a55366449bc8dea638e24200bb3dd0
parent7130e9ddb16286efd7d01088e816f05e82cfa2a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
config/config.exs