Merge branch 'subtree'

author Niki Roo <niki@nikiroo.be>

Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)

committer Niki Roo <niki@nikiroo.be>

Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
author Niki Roo <niki@nikiroo.be>
Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
committer Niki Roo <niki@nikiroo.be>
Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
diff --cc src/be/nikiroo/fanfix/Main.java
Simple merge
diff --cc src/be/nikiroo/fanfix/VersionCheck.java
Simple merge
diff --cc src/be/nikiroo/fanfix/bundles/Config.java
Simple merge
author	Niki Roo <niki@nikiroo.be>
	Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
committer	Niki Roo <niki@nikiroo.be>
	Tue, 5 May 2020 20:40:52 +0000 (22:40 +0200)
		1	2
src/be/nikiroo/fanfix/Main.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/VersionCheck.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/bundles/Config.java	patch \|	diff1 \|	diff2 \|	blob \| history