Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d'
authorNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 22:10:12 +0000 (00:10 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 22:10:12 +0000 (00:10 +0200)
commitc7815cfa99db7838805561d7b64813f1ab01c76c
treef305c1f973c1b6c2d2a8f3de570c2efe696d7f22
parent105c631ed98af30e32378848941da520af2b44d5
parent5f3671e17febc5b7f6abbfc62c66c4045d47ec8d
Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d'
42 files changed:
src/be/nikiroo/fanfix/Instance.java
src/be/nikiroo/fanfix/Main.java
src/be/nikiroo/fanfix/VERSION
src/be/nikiroo/fanfix/bundles/Config.java
src/be/nikiroo/fanfix/data/JsonIO.java
src/be/nikiroo/fanfix/library/MetaResultList.java
src/be/nikiroo/fanfix/library/RemoteLibrary.java
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
src/be/nikiroo/fanfix/library/WebLibrary.java
src/be/nikiroo/fanfix/library/WebLibraryServer.java
src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java
src/be/nikiroo/fanfix/library/web/actual_size-32x32.png
src/be/nikiroo/fanfix/library/web/actual_size-64x64.png
src/be/nikiroo/fanfix/library/web/arrow_double_left-32x32.png
src/be/nikiroo/fanfix/library/web/arrow_double_left-64x64.png
src/be/nikiroo/fanfix/library/web/arrow_double_right-32x32.png
src/be/nikiroo/fanfix/library/web/arrow_double_right-64x64.png
src/be/nikiroo/fanfix/library/web/arrow_left-32x32.png
src/be/nikiroo/fanfix/library/web/arrow_left-64x64.png
src/be/nikiroo/fanfix/library/web/arrow_right-32x32.png
src/be/nikiroo/fanfix/library/web/arrow_right-64x64.png
src/be/nikiroo/fanfix/library/web/avicon.ico
src/be/nikiroo/fanfix/library/web/back-32x32.png
src/be/nikiroo/fanfix/library/web/back-64x64.png
src/be/nikiroo/fanfix/library/web/favicon.ico
src/be/nikiroo/fanfix/library/web/fit_to_height-32x32.png
src/be/nikiroo/fanfix/library/web/fit_to_height-64x64.png
src/be/nikiroo/fanfix/library/web/fit_to_width-32x32.png
src/be/nikiroo/fanfix/library/web/fit_to_width-64x64.png
src/be/nikiroo/fanfix/library/web/icon_alternative.png
src/be/nikiroo/fanfix/library/web/icon_default.png
src/be/nikiroo/fanfix/library/web/icon_magic_book.png
src/be/nikiroo/fanfix/library/web/icon_pony_book.png
src/be/nikiroo/fanfix/library/web/icon_pony_library.png
src/be/nikiroo/fanfix/library/web/index.post.html
src/be/nikiroo/fanfix/library/web/index.pre.html
src/be/nikiroo/fanfix/library/web/search-32x32.png
src/be/nikiroo/fanfix/library/web/search-64x64.png
src/be/nikiroo/fanfix/library/web/style.css
src/be/nikiroo/fanfix/library/web/unknown-32x32.png
src/be/nikiroo/fanfix/library/web/unknown-64x64.png
src/be/nikiroo/fanfix/reader/TextOutput.java