Merge commit '877a44c78f1c4985aa362f6cdce385a4f860b51d'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:41:40 +0000 (16:41 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:41:40 +0000 (16:41 +0200)
commitfe5b14f80c5928ca747dcd21ffd7f865017c5d90
tree7c9c8ebac0a65a88bfcd703927609fd2fd63d300
parent5ab47373781070f4598cbb2e5361d90ce098ca79
parent877a44c78f1c4985aa362f6cdce385a4f860b51d
Merge commit '877a44c78f1c4985aa362f6cdce385a4f860b51d'
src/be/nikiroo/fanfix/data/JsonIO.java
src/be/nikiroo/fanfix/library/WebLibraryServer.java