projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 414902c 74ef14b)
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)
Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087

1  2 
docs/config.md patch | diff1 | diff2 | blob | history

diff --cc docs/config.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git