Merge commit 'a95896878f4b4a79448b39ce93a4e0d3258b4a43'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 17 Aug 2018 08:09:42 +0000 (10:09 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 17 Aug 2018 08:09:42 +0000 (10:09 +0200)
commit873f8805cbfaee2d300f3264413b45b85399b767
tree7c943edc5ffad9b00b6d5081ad8cfb77a4c67a3e
parent37438757788d279c839506d54f460b2ab37db164
parenta95896878f4b4a79448b39ce93a4e0d3258b4a43
Merge commit 'a95896878f4b4a79448b39ce93a4e0d3258b4a43'
docs/content/en/content-management/multilingual.md
docs/content/en/getting-started/configuration.md
docs/content/en/getting-started/directory-structure.md
docs/content/en/getting-started/installing.md
docs/content/en/showcase/arolla-cocoon/bio.md
docs/content/en/showcase/arolla-cocoon/featured-template.png
docs/content/en/showcase/arolla-cocoon/index.md
docs/content/zh/templates/base.md
docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_1024x512_fill_catmullrom_top_2.png
docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_640x0_resize_catmullrom_2.png
docs/resources/_gen/images/showcase/arolla-cocoon/featured-template_hu22aab819ab27e4f878d1ff0b7cf78050_451984_ea485187288cde4b679b149346aca832.png