Merge commit 'd6a4af7018e8618944a6471ceeb7aae1d4df6afa'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Mon, 29 Oct 2018 08:28:01 +0000 (09:28 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Mon, 29 Oct 2018 08:28:01 +0000 (09:28 +0100)
commit27569275b16d19e76da1fc2822bb5fcc9cb98f93
treed3414bd8f0d23ebb424b6f7d2d499cecbef154de
parent4b2738d87108ac7254b5e18ba842edb838affff4
parentd6a4af7018e8618944a6471ceeb7aae1d4df6afa
Merge commit 'd6a4af7018e8618944a6471ceeb7aae1d4df6afa'
docs/content/en/templates/shortcode-templates.md