From: Niki Roo Date: Wed, 20 May 2020 12:18:46 +0000 (+0200) Subject: Merge branch 'master' into subtree X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=258e065f81071a861711ef935dca3ec5563f4360;p=fanfix-swing.git Merge branch 'master' into subtree --- 258e065f81071a861711ef935dca3ec5563f4360 diff --cc library/Template.java index 00000000,3536d5f1..3536d5f1 mode 000000,100644..100644 --- a/library/Template.java +++ b/library/Template.java diff --cc library/web/templates/index.html index 00000000,6f3934e2..6f3934e2 mode 000000,100644..100644 --- a/library/web/templates/index.html +++ b/library/web/templates/index.html diff --cc library/web/templates/login.html index 00000000,00191442..00191442 mode 000000,100644..100644 --- a/library/web/templates/login.html +++ b/library/web/templates/login.html diff --cc library/web/templates/message.html index 00000000,a09fc4d6..a09fc4d6 mode 000000,100644..100644 --- a/library/web/templates/message.html +++ b/library/web/templates/message.html diff --cc library/web/templates/viewer.html index 00000000,f4b42153..f4b42153 mode 000000,100644..100644 --- a/library/web/templates/viewer.html +++ b/library/web/templates/viewer.html