Merge branch 'bugfix/formatting' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 22:56:18 +0000 (22:56 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 22:56:18 +0000 (22:56 +0000)
commit927be2c62b40fafdfd3eabba768bccf428d4c74d
tree75514700ffff06c66afa4c06225f97f4d17686b4
parente394e5943dd2fa6602dc62d148259fd3e125a077
parentbc3c30430e564a510c80694ef30091942520d1e8
Merge branch 'bugfix/formatting' into 'develop'

fix formatting

See merge request pleroma/pleroma!301