From: Niki Roo <niki@nikiroo.be>
Date: Fri, 10 Apr 2020 17:12:41 +0000 (+0200)
Subject: Merge branch 'master' into subtree
X-Git-Tag: fanfix-swing-0.0.1~12^2~6
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=2e1300b9580ae1b6dded5a734c617a66a116c16d;p=fanfix-swing.git

Merge branch 'master' into subtree
---

2e1300b9580ae1b6dded5a734c617a66a116c16d
diff --cc library/MetaResultList.java
index 00000000,886defe8..886defe8
mode 000000,100644..100644
--- a/library/MetaResultList.java
+++ b/library/MetaResultList.java
diff --cc supported/MangaHub.java
index 00000000,706a5911..706a5911
mode 000000,100644..100644
--- a/supported/MangaHub.java
+++ b/supported/MangaHub.java