Commit graph

8 commits

Author SHA1 Message Date
Bjørn Erik Pedersen
df1677a6e8
Merge commit '05e42bc643f1840ed2ad9c2eff82a269d1381683' 2017-11-17 13:48:33 +01:00
Kaushal Modi
488631fe0a Add support for height argument to figure shortcode
Fixes #4014
2017-10-29 20:46:57 +01:00
Bjørn Erik Pedersen
c0370e0ee3 Merge commit 'ba45da9d03056447e4873de13d4e0f8d658a769b' 2017-09-21 19:05:40 +02:00
Bjørn Erik Pedersen
a1900826b9 Merge commit 'ec4e6f9df2ab9ffdc62a3f59675369096e0d3f77' as 'docs' 2017-08-10 17:18:22 +02:00
Bjørn Erik Pedersen
d384c661fe docs: Re-integrate 2017-08-10 17:17:07 +02:00
Bjørn Erik Pedersen
1c18f3fc49 Merge commit '50ec65fbe1a48475d3320775dab2c47389c02114' 2017-07-31 09:21:24 +02:00
Bjørn Erik Pedersen
f387cb1b38 doc: Merge commit '2c0d1ccdcd95de0bddeb39dca2e4d08f0d8056d7' 2017-07-21 11:00:08 +02:00
Bjørn Erik Pedersen
4c220c4ac2 Merge commit '6dbde8d731f221b027c0c60b772ba82dad759943'
Fixes #3709
2017-07-18 10:33:58 +02:00