From: Niki Roo Date: Sun, 17 May 2020 20:13:04 +0000 (+0200) Subject: Merge commit 'e992c260c059c53c4aabc980db85efd58f190205' X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=1ae33662c6f7760eef064d1df432a6bb8723b837;p=fanfix-swing.git Merge commit 'e992c260c059c53c4aabc980db85efd58f190205' --- 1ae33662c6f7760eef064d1df432a6bb8723b837 diff --cc src/be/nikiroo/fanfix/library/web/package-info.java index 00000000,69bff54a..69bff54a mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/package-info.java +++ b/src/be/nikiroo/fanfix/library/web/package-info.java diff --cc src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java index 00000000,482a1b82..482a1b82 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java +++ b/src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java diff --cc src/be/nikiroo/fanfix/library/web/templates/bookline.html index 00000000,9b1a6b78..9b1a6b78 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/bookline.html +++ b/src/be/nikiroo/fanfix/library/web/templates/bookline.html diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.html index 00000000,f3f30478..f3f30478 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/browser.html +++ b/src/be/nikiroo/fanfix/library/web/templates/browser.html diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.option.html index 00000000,49f7b5b1..49f7b5b1 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/browser.option.html +++ b/src/be/nikiroo/fanfix/library/web/templates/browser.option.html diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.select.html index 00000000,447d845a..447d845a mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/browser.select.html +++ b/src/be/nikiroo/fanfix/library/web/templates/browser.select.html diff --cc src/be/nikiroo/fanfix/library/web/templates/index.banner.html index 00000000,c2cd1e7f..c2cd1e7f mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/index.banner.html +++ b/src/be/nikiroo/fanfix/library/web/templates/index.banner.html diff --cc src/be/nikiroo/fanfix/library/web/templates/index.post.html index 00000000,52ba19e7..52ba19e7 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/index.post.html +++ b/src/be/nikiroo/fanfix/library/web/templates/index.post.html diff --cc src/be/nikiroo/fanfix/library/web/templates/package-info.java index 00000000,5d4f3b2e..5d4f3b2e mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/package-info.java +++ b/src/be/nikiroo/fanfix/library/web/templates/package-info.java diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html index 00000000,21cddc45..21cddc45 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html index 00000000,9d619879..9d619879 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.image.html index 00000000,24165162..24165162 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.link.html index 00000000,5812c80a..5812c80a mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html index 00000000,59f35be1..59f35be1 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html index 00000000,b85f9a9a..b85f9a9a mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html index 00000000,1d1eaec1..1d1eaec1 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.text.html index 00000000,4562ea47..4562ea47 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html