From: Niki Roo Date: Wed, 13 May 2020 21:39:37 +0000 (+0200) Subject: Merge commit '87ffaa787388b0389f5134aa70c4b1e2e940c118' X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=033be8929ed0a4fc79db7007abcba015cb46337f;p=fanfix-swing.git Merge commit '87ffaa787388b0389f5134aa70c4b1e2e940c118' --- 033be8929ed0a4fc79db7007abcba015cb46337f diff --cc src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java index 00000000,c28188cd..c28188cd mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java +++ b/src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java diff --cc src/be/nikiroo/fanfix/library/WebLibraryUrls.java index 00000000,be4cf256..be4cf256 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/WebLibraryUrls.java +++ b/src/be/nikiroo/fanfix/library/WebLibraryUrls.java