Merge commit '4b3d19dce4816fee47886ae525664fef74e0380e'
authorNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 23:05:44 +0000 (01:05 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 23:05:44 +0000 (01:05 +0200)
commitc1459c23d8804e7544a191d7ebdcb85712908e6b
treec6d1a01ff5cdb7e6880ce1510771fa5942f6998c
parentcdc9ad9a9e88616c65400a4ef0dfaed883ce270d
parent4b3d19dce4816fee47886ae525664fef74e0380e
Merge commit '4b3d19dce4816fee47886ae525664fef74e0380e'
src/be/nikiroo/fanfix/data/JsonIO.java
src/be/nikiroo/fanfix/data/Paragraph.java
src/be/nikiroo/fanfix/library/WebLibrary.java
src/be/nikiroo/fanfix/library/WebLibraryServer.java