Merge commit '337d0c5f516ee085205e8abefdb7f87e6d33ca05'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 31 Jan 2018 10:08:08 +0000 (11:08 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 31 Jan 2018 10:08:08 +0000 (11:08 +0100)
commit158e1151cdfbdebd2e4a527e828d8a0b17933787
treeb73947184a82fe10366dbefe7e3f2d0e415ae801
parentf0c0ece44d55b6c2997cbd106d1bc099ea1a2fa7
parent337d0c5f516ee085205e8abefdb7f87e6d33ca05
Merge commit '337d0c5f516ee085205e8abefdb7f87e6d33ca05'
54 files changed:
docs/archetypes/default.md
docs/archetypes/functions.md
docs/config.toml
docs/content/about/features.md
docs/content/about/new-in-032/index.md
docs/content/about/what-is-hugo.md
docs/content/content-management/archetypes.md
docs/content/content-management/front-matter.md
docs/content/content-management/image-processing/index.md
docs/content/content-management/image-processing/sunset.jpg
docs/content/content-management/multilingual.md
docs/content/content-management/organization/1-featured-content-bundles.png
docs/content/content-management/organization/index.md
docs/content/content-management/page-bundles.md
docs/content/content-management/page-resources.md
docs/content/content-management/taxonomies.md
docs/content/contribute/documentation.md
docs/content/functions/cond.md
docs/content/functions/int.md
docs/content/getting-started/configuration.md
docs/content/getting-started/installing.md
docs/content/hosting-and-deployment/deployment-with-nanobox.md
docs/content/hosting-and-deployment/hosting-on-github.md
docs/content/hosting-and-deployment/hosting-on-netlify.md
docs/content/news/0.33-relnotes-ready.md
docs/content/news/0.34-relnotes-ready.md
docs/content/templates/homepage.md
docs/content/templates/lists.md
docs/content/templates/lookup-order.md
docs/content/templates/menu-templates.md
docs/content/templates/rss.md
docs/content/templates/section-templates.md
docs/content/templates/shortcode-templates.md
docs/content/templates/single-page-templates.md
docs/content/templates/sitemap-template.md
docs/content/templates/taxonomy-templates.md
docs/content/tools/editors.md
docs/content/tools/migrations.md
docs/content/tools/search.md
docs/content/variables/menus.md
docs/content/variables/page.md
docs/data/docs.json
docs/layouts/shortcodes/datatable-filtered.html
docs/layouts/shortcodes/imgproc.html
docs/netlify.toml
docs/resources/_gen/images/content-management/image-processing/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_300x0_resize_q10_box_center.jpg
docs/resources/_gen/images/content-management/image-processing/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_300x0_resize_q75_box_center.jpg
docs/resources/_gen/images/content-management/image-processing/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_90x120_fill_q75_box_left.jpg
docs/resources/_gen/images/content-management/image-processing/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_90x120_fill_q75_box_right.jpg
docs/resources/_gen/images/content-management/image-processing/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_90x90_fit_q75_box_center.jpg
docs/resources/_gen/images/content-management/organization/1-featured-content-bundles_hu3e3ae7839b071119f32acaa20f204198_63640_300x0_resize_box_center.png
docs/static/images/blog/hugo-33-poster.png
docs/static/images/blog/hugo-34-poster.png
docs/themes/gohugoioTheme/layouts/_default/baseof.html