Merge branch 'master' into subtree
authorNiki Roo <niki@nikiroo.be>
Thu, 2 Apr 2020 10:03:23 +0000 (12:03 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 2 Apr 2020 10:03:23 +0000 (12:03 +0200)
1  2 
Main.java
supported/Text.java

diff --cc Main.java
Simple merge
Simple merge