merge from master
authorNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 23:04:01 +0000 (01:04 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 23:04:01 +0000 (01:04 +0200)
commit4b3d19dce4816fee47886ae525664fef74e0380e
treee3e451c390f6e2b41218f67ee49b400aa3f8e0a1
parent5f3671e17febc5b7f6abbfc62c66c4045d47ec8d
merge from master
data/JsonIO.java
data/Paragraph.java
library/WebLibrary.java
library/WebLibraryServer.java