Merge branch 'master' into subtree
authorNiki Roo <niki@nikiroo.be>
Sat, 18 Apr 2020 15:19:31 +0000 (17:19 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 18 Apr 2020 15:19:31 +0000 (17:19 +0200)
1  2 
data/MetaData.java
library/MetaResultList.java

Simple merge
Simple merge