Merge commit '379a497e6fd2b959c57b2ff4023413e2daf36232'

diff --cc src/be/nikiroo/fanfix/data/MetaData.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibrary.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibraryServer.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/WebLibraryServerIndex.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width_limited-32x32.png
index 0000000000000000000000000000000000000000,49710461e7d07bc986dca901078481b6f1672cc6..49710461e7d07bc986dca901078481b6f1672cc6
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width_limited-64x64.png
index 0000000000000000000000000000000000000000,bd979421032713d91df576fadbfd334284dff059..bd979421032713d91df576fadbfd334284dff059
mode 000000,100644..100644
Binary files differ

diff --cc src/be/nikiroo/fanfix/library/web/package-info.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/style.css
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/templates/index.html
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/templates/login.html
index 0000000000000000000000000000000000000000,001914429438df696f33b79337229c7c0ef5ff2a..001914429438df696f33b79337229c7c0ef5ff2a
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/login.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/login.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/message.html
index 0000000000000000000000000000000000000000,a09fc4d628b439d71f6e271a485822b44ab06294..a09fc4d628b439d71f6e271a485822b44ab06294
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/message.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/message.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/package-info.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html
index 0000000000000000000000000000000000000000,64483c992c03045f14eed56be98dab682665066d..64483c992c03045f14eed56be98dab682665066d
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.image.nolink.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html

diff --cc src/be/nikiroo/fanfix/supported/BasicSupport.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/EHentai.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/Fanfiction.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/Fimfiction.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/FimfictionApi.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/MangaHub.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

diff --cc src/be/nikiroo/fanfix/supported/YiffStar.java
Simple merge