Merge branch 'subtree'

author Niki Roo <niki@nikiroo.be>

Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)

committer Niki Roo <niki@nikiroo.be>

Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)
author Niki Roo <niki@nikiroo.be>
Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)
committer Niki Roo <niki@nikiroo.be>
Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)
diff --cc src/be/nikiroo/fanfix/bundles/UiConfig.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/BasicSupport.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/E621.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/FimfictionApi.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/InfoReader.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/MangaLel.java
Simple merge
diff --cc src/be/nikiroo/fanfix/supported/Text.java
Simple merge
author	Niki Roo <niki@nikiroo.be>
	Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)
committer	Niki Roo <niki@nikiroo.be>
	Sat, 2 May 2020 11:24:58 +0000 (13:24 +0200)
		1	2
src/be/nikiroo/fanfix/bundles/UiConfig.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/BasicSupport.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/BasicSupportHelper.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/E621.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/FimfictionApi.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/InfoReader.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/MangaLel.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/be/nikiroo/fanfix/supported/Text.java	patch \|	diff1 \|	diff2 \|	blob \| history