Merge branch 'master' into subtree
authorNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 21:57:44 +0000 (23:57 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 21:57:44 +0000 (23:57 +0200)
commit5f3671e17febc5b7f6abbfc62c66c4045d47ec8d
tree37b16048b40ec6b5f21f252049238d8e76b3baaa
parentbb0c30accc7248ef6a0c79a75c40a225062cc6a3
parent703495e0ed29c5e63c772979a7b74a9d9449c61d
Merge branch 'master' into subtree
41 files changed:
Instance.java
Main.java
bundles/Config.java
data/JsonIO.java
library/MetaResultList.java
library/RemoteLibrary.java
library/RemoteLibraryServer.java
library/WebLibrary.java
library/WebLibraryServer.java
library/web/WebLibraryServerIndex.java
library/web/actual_size-32x32.png
library/web/actual_size-64x64.png
library/web/arrow_double_left-32x32.png
library/web/arrow_double_left-64x64.png
library/web/arrow_double_right-32x32.png
library/web/arrow_double_right-64x64.png
library/web/arrow_left-32x32.png
library/web/arrow_left-64x64.png
library/web/arrow_right-32x32.png
library/web/arrow_right-64x64.png
library/web/avicon.ico
library/web/back-32x32.png
library/web/back-64x64.png
library/web/favicon.ico
library/web/fit_to_height-32x32.png
library/web/fit_to_height-64x64.png
library/web/fit_to_width-32x32.png
library/web/fit_to_width-64x64.png
library/web/icon_alternative.png
library/web/icon_default.png
library/web/icon_magic_book.png
library/web/icon_pony_book.png
library/web/icon_pony_library.png
library/web/index.post.html
library/web/index.pre.html
library/web/search-32x32.png
library/web/search-64x64.png
library/web/style.css
library/web/unknown-32x32.png
library/web/unknown-64x64.png
reader/TextOutput.java