Merge branch 'master' into lash/exporter - confini - Parse and merge multiple ini files in python3

commit 162a0b6d4f0772e425dbe142e55575631e306512
parent 3a0e02712bedd6ee2ec49f0c615494c6239a9d12
Author: nolash <dev@holbrook.no>
Date:   Tue,  2 Nov 2021 06:14:48 +0100

Merge branch 'master' into lash/exporter

	confini Parse and merge multiple ini files in python3
	git clone git://git.defalsify.org/python-confini.git
	Log \| Files \| Refs \| README \| LICENSE