Merge branch 'master' into pr/nekr0z/415
# Conflicts: # exampleSite/content/posts/theme-documentation-extended-shortcodes/index.en.md
This commit is contained in:
# Conflicts: # exampleSite/content/posts/theme-documentation-extended-shortcodes/index.en.md