Merge branch 'develop' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 31 Jan 2019 16:28:40 +0000 (16:28 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 31 Jan 2019 16:28:40 +0000 (16:28 +0000)
commitdea33f4aecfe55e980c2839b686f84244a49c5ed
treec6055cd0bf6946f1f1a76b3757ffce9ab6011099
parentfb9730010e794a7f80c94b4320fd0591f2e7c93c
parenta0dc95d0849fecdc2251efade18435e98f16f682
Merge branch 'develop' into 'develop'

Clarify the description of the `logo_mask` configuration key.

See merge request pleroma/pleroma!747
docs/config.md