From: kaniini <nenolod@gmail.com>
Date: Tue, 23 Apr 2019 02:41:21 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7dcac0bac0252e2c824e6139196dca9d28903ad8;p=akkoma

Merge branch 'develop' into 'develop'

Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087
---

7dcac0bac0252e2c824e6139196dca9d28903ad8