Merge branch 'fix/1019-refactor' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)
committerkaniini <ariadne@dereferenced.org>
Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)
commite4e3fd7e5552db274655d58bbbec1e4faabf7ccd
tree744524f1eac36a5c6d3b0cfb0aa121e920c86dbc
parent6c491b2006ef2f279e6ffbb4ac007b7740c6d50d
parent59e16fc45a2fe1fa6bfeaecaa35f485b8a34bb6d
Merge branch 'fix/1019-refactor' into 'develop'

Fix/1019 refactor

See merge request pleroma/pleroma!1397