merge from master
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:16:39 +0000 (16:16 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:16:39 +0000 (16:16 +0200)
commitb627826356289872dd817b9e5903e209fa881886
treeb803634bc1da761bacebcdc93d469767b158ddb7
parent9bd801bfc6a10e5298cdec6e48ca0506ecdfde53
merge from master
data/JsonIO.java
library/WebLibraryServer.java