From: Niki Roo <niki@nikiroo.be>
Date: Mon, 11 May 2020 21:57:44 +0000 (+0200)
Subject: Merge branch 'master' into subtree
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=5f3671e17febc5b7f6abbfc62c66c4045d47ec8d;p=fanfix.git

Merge branch 'master' into subtree
---

5f3671e17febc5b7f6abbfc62c66c4045d47ec8d
diff --cc data/JsonIO.java
index 0000000,db81db6..db81db6
mode 000000,100644..100644
--- a/data/JsonIO.java
+++ b/data/JsonIO.java
diff --cc library/WebLibrary.java
index 0000000,369eb23..369eb23
mode 000000,100644..100644
--- a/library/WebLibrary.java
+++ b/library/WebLibrary.java
diff --cc library/WebLibraryServer.java
index 0000000,e0096fc..e0096fc
mode 000000,100644..100644
--- a/library/WebLibraryServer.java
+++ b/library/WebLibraryServer.java
diff --cc library/web/WebLibraryServerIndex.java
index 0000000,15c371b..15c371b
mode 000000,100644..100644
--- a/library/web/WebLibraryServerIndex.java
+++ b/library/web/WebLibraryServerIndex.java
diff --cc library/web/actual_size-32x32.png
index 0000000,0d356b7..0d356b7
mode 000000,100644..100644
Binary files differ
diff --cc library/web/actual_size-64x64.png
index 0000000,474afda..474afda
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_left-32x32.png
index 0000000,e163b60..e163b60
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_left-64x64.png
index 0000000,e66dd93..e66dd93
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_right-32x32.png
index 0000000,297dcab..297dcab
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_double_right-64x64.png
index 0000000,52226f6..52226f6
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_left-32x32.png
index 0000000,af83425..af83425
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_left-64x64.png
index 0000000,44cba9c..44cba9c
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_right-32x32.png
index 0000000,2540b62..2540b62
mode 000000,100644..100644
Binary files differ
diff --cc library/web/arrow_right-64x64.png
index 0000000,ab960b3..ab960b3
mode 000000,100644..100644
Binary files differ
diff --cc library/web/avicon.ico
index 0000000,e69de29..e69de29
mode 000000,100644..100644
--- a/library/web/avicon.ico
+++ b/library/web/avicon.ico
diff --cc library/web/back-32x32.png
index 0000000,46c19dc..46c19dc
mode 000000,100644..100644
Binary files differ
diff --cc library/web/back-64x64.png
index 0000000,d58d004..d58d004
mode 000000,100644..100644
Binary files differ
diff --cc library/web/favicon.ico
index 0000000,feedaf0..feedaf0
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_height-32x32.png
index 0000000,727dec2..727dec2
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_height-64x64.png
index 0000000,cec7da4..cec7da4
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_width-32x32.png
index 0000000,ee90843..ee90843
mode 000000,100644..100644
Binary files differ
diff --cc library/web/fit_to_width-64x64.png
index 0000000,7b897d2..7b897d2
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_alternative.png
index 0000000,4ab0957..4ab0957
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_default.png
index 0000000,983b344..983b344
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_magic_book.png
index 0000000,1798dd3..1798dd3
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_pony_book.png
index 0000000,fb6fe0d..fb6fe0d
mode 000000,100644..100644
Binary files differ
diff --cc library/web/icon_pony_library.png
index 0000000,a56a4d2..a56a4d2
mode 000000,100644..100644
Binary files differ
diff --cc library/web/index.post.html
index 0000000,d4e0905..d4e0905
mode 000000,100644..100644
--- a/library/web/index.post.html
+++ b/library/web/index.post.html
diff --cc library/web/index.pre.html
index 0000000,18c1508..18c1508
mode 000000,100644..100644
--- a/library/web/index.pre.html
+++ b/library/web/index.pre.html
diff --cc library/web/search-32x32.png
index 0000000,92b716d..92b716d
mode 000000,100644..100644
Binary files differ
diff --cc library/web/search-64x64.png
index 0000000,93dbf6d..93dbf6d
mode 000000,100644..100644
Binary files differ
diff --cc library/web/style.css
index 0000000,c520d78..c520d78
mode 000000,100644..100644
--- a/library/web/style.css
+++ b/library/web/style.css
diff --cc library/web/unknown-32x32.png
index 0000000,d2315d1..d2315d1
mode 000000,100644..100644
Binary files differ
diff --cc library/web/unknown-64x64.png
index 0000000,261889d..261889d
mode 000000,100644..100644
Binary files differ
diff --cc reader/TextOutput.java
index 0000000,60b3a7f..60b3a7f
mode 000000,100644..100644
--- a/reader/TextOutput.java
+++ b/reader/TextOutput.java