From: Niki Roo <niki@nikiroo.be>
Date: Wed, 20 May 2020 15:29:43 +0000 (+0200)
Subject: Merge commit '868c706b81e33e99c5f57fb9fc200808e061c4bb'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e255ce91075183e6dc0d0355fda32f0825df791c;p=fanfix-swing.git

Merge commit '868c706b81e33e99c5f57fb9fc200808e061c4bb'
---

e255ce91075183e6dc0d0355fda32f0825df791c
diff --cc src/be/nikiroo/fanfix/library/Template.java
index 00000000,a116ef67..a116ef67
mode 000000,100644..100644
--- a/src/be/nikiroo/fanfix/library/Template.java
+++ b/src/be/nikiroo/fanfix/library/Template.java