From: Niki Roo Date: Tue, 26 May 2020 19:19:16 +0000 (+0200) Subject: Merge commit '379a497e6fd2b959c57b2ff4023413e2daf36232' X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=8c376082bed6b815ede7de2b5d3d16e3bc6eb38f;p=fanfix-swing.git Merge commit '379a497e6fd2b959c57b2ff4023413e2daf36232' --- 8c376082bed6b815ede7de2b5d3d16e3bc6eb38f diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width_limited-32x32.png index 00000000,49710461..49710461 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/fit_to_width_limited-64x64.png index 00000000,bd979421..bd979421 mode 000000,100644..100644 Binary files differ diff --cc src/be/nikiroo/fanfix/library/web/templates/login.html index 00000000,00191442..00191442 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/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 00000000,a09fc4d6..a09fc4d6 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/message.html +++ b/src/be/nikiroo/fanfix/library/web/templates/message.html diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html index 00000000,64483c99..64483c99 mode 000000,100644..100644 --- a/src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html +++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.nolink.html