diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
| commit | 7dcac0bac0252e2c824e6139196dca9d28903ad8 (patch) | |
| tree | 1c15303fe7d8d1fa374b1df63494735f82e266fc /lib | |
| parent | 414902cd9e61d19d4dcd848f60b47beaf23c095f (diff) | |
| parent | 74ef14b04e6decf05bd61ef44ea459c24273f192 (diff) | |
| download | pleroma-7dcac0bac0252e2c824e6139196dca9d28903ad8.tar.gz | |
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions