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/?p=fanfix.git;a=commitdiff_plain;h=258e065f81071a861711ef935dca3ec5563f4360 Merge branch 'master' into subtree --- 258e065f81071a861711ef935dca3ec5563f4360 diff --cc library/Template.java index 0000000,3536d5f..3536d5f mode 000000,100644..100644 --- a/library/Template.java +++ b/library/Template.java diff --cc library/web/templates/index.html index 0000000,6f3934e..6f3934e mode 000000,100644..100644 --- a/library/web/templates/index.html +++ b/library/web/templates/index.html diff --cc library/web/templates/login.html index 0000000,0019144..0019144 mode 000000,100644..100644 --- a/library/web/templates/login.html +++ b/library/web/templates/login.html diff --cc library/web/templates/message.html index 0000000,a09fc4d..a09fc4d mode 000000,100644..100644 --- a/library/web/templates/message.html +++ b/library/web/templates/message.html diff --cc library/web/templates/viewer.html index 0000000,f4b4215..f4b4215 mode 000000,100644..100644 --- a/library/web/templates/viewer.html +++ b/library/web/templates/viewer.html