Skip to content
Snippets Groups Projects
Commit 7dcac0ba authored by kaniini's avatar kaniini
Browse files

Merge branch 'develop' into 'develop' 

Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087
parents 414902cd 74ef14b0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment