Merge commit '4536c5cf2d7b8e68768f90d281b3e4974cd26ae9'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 10:12:04 +0000 (12:12 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 10:12:04 +0000 (12:12 +0200)
commitb0339d237c4582b0d4fe13a93daf45d943479b7c
tree3101638f72ecf04a0a6c84bd06a3bf5f420438ea
parent3da0edf58b42e0bb8189f13491b27633fb697a87
parent4536c5cf2d7b8e68768f90d281b3e4974cd26ae9
Merge commit '4536c5cf2d7b8e68768f90d281b3e4974cd26ae9'
src/be/nikiroo/fanfix/data/JsonIO.java
src/be/nikiroo/fanfix/library/BasicLibrary.java
src/be/nikiroo/fanfix/library/CacheLibrary.java
src/be/nikiroo/fanfix/library/LocalLibrary.java
src/be/nikiroo/fanfix/library/RemoteLibrary.java
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
src/be/nikiroo/fanfix/library/WebLibrary.java
src/be/nikiroo/fanfix/library/WebLibraryServer.java
src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
src/be/nikiroo/fanfix/library/WebLibraryUrls.java