13 commits

Author	SHA1	Message	Date
Bjørn Erik Pedersen	70005364a2	docs: Add docs for lang.Merge ... See https://github.com/gohugoio/hugo/issues/4463	2018-03-16 10:10:01 +01:00
Bjørn Erik Pedersen	91fb8f1b59	Merge commit '3886fc1fef6ac19d58b9ba1bb642d0c6c9a54031'	2018-03-16 09:44:54 +01:00
Bjørn Erik Pedersen	15ff076572	Merge commit 'c305e44f5f081e4436195923a4593e396f07cd49'	2018-02-05 14:24:24 +01:00
Bjørn Erik Pedersen	158e1151cd	Merge commit '337d0c5f516ee085205e8abefdb7f87e6d33ca05'	2018-01-31 11:08:08 +01:00
Bjørn Erik Pedersen	b3eeb97642	Merge commit '3cf4300097610bb8b5bd0686d96d1df5db641895'	2018-01-17 22:33:07 +01:00
Bjørn Erik Pedersen	245212a5b7	Merge commit 'f3cd083961f36dc96d05e98aaf67f650102bc757'	2017-12-30 09:17:23 +01:00
Bjørn Erik Pedersen	14786c4d8f	Merge commit '30c0d485eaff6d70df1be0353911ddca485d52bf'	2017-11-20 11:19:16 +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