Merge commit '9a553563269f93bae59cf45e43933c81fdec07e8'
authorNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 18:47:12 +0000 (20:47 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 5 May 2020 18:47:12 +0000 (20:47 +0200)
commitb756fcaa14439341852ada71e4ae5a221d3289ca
tree72cab4c0985882d852f2a48f6453c2e43d84bfe6
parentabc79820cf25f0507cbe28b3ffe08bdce5d85510
parent9a553563269f93bae59cf45e43933c81fdec07e8
Merge commit '9a553563269f93bae59cf45e43933c81fdec07e8'
19 files changed:
src/be/nikiroo/fanfix/Main.java
src/be/nikiroo/fanfix/VersionCheck.java
src/be/nikiroo/fanfix/library/RemoteLibrary.java
src/be/nikiroo/fanfix/test/BasicSupportDeprecatedTest.java
src/be/nikiroo/fanfix/test/BasicSupportUtilitiesTest.java
src/be/nikiroo/fanfix/test/ConversionTest.java
src/be/nikiroo/fanfix/test/LibraryTest.java
src/be/nikiroo/fanfix/test/Test.java
src/be/nikiroo/fanfix/test/expected_test.story/cbz.cbz
src/be/nikiroo/fanfix/test/expected_test.story/epub.epub
src/be/nikiroo/fanfix/test/expected_test.story/html/html.info
src/be/nikiroo/fanfix/test/expected_test.story/html/html.txt
src/be/nikiroo/fanfix/test/expected_test.story/html/index.html
src/be/nikiroo/fanfix/test/expected_test.story/html/style.css
src/be/nikiroo/fanfix/test/expected_test.story/info_text
src/be/nikiroo/fanfix/test/expected_test.story/info_text.info
src/be/nikiroo/fanfix/test/expected_test.story/latex.tex
src/be/nikiroo/fanfix/test/expected_test.story/text.txt
src/be/nikiroo/fanfix/test/test.story