Merge branch 'develop' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 23 Apr 2019 02:41:21 +0000 (02:41 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 23 Apr 2019 02:41:21 +0000 (02:41 +0000)
commit7dcac0bac0252e2c824e6139196dca9d28903ad8
tree1c15303fe7d8d1fa374b1df63494735f82e266fc
parent414902cd9e61d19d4dcd848f60b47beaf23c095f
parent74ef14b04e6decf05bd61ef44ea459c24273f192
Merge branch 'develop' into 'develop'

Add shortcode_globs setting to documentation

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