Merge branch 'master' into lua-as-page-metaconf - ferron - Ferron is a fast and simple static website generator made with Lua.

commit 913ad9de7b989c78ed1765afd9484b35f1a84059
parent c50f02ef8ef0edc212e78e491f1b8e63dfb769a9
Author: Hugo Soucy <hugo@soucy.cc>
Date:   Sat, 12 Jan 2019 13:16:05 -0500

Merge branch 'master' into lua-as-page-metaconf

	ferron Ferron is a fast and simple static website generator made with Lua.
	Log \| Files \| Refs \| Submodules \| README \| LICENSE