Merge branch 'master' into subtree
authorNiki Roo <niki@nikiroo.be>
Fri, 10 Apr 2020 17:12:41 +0000 (19:12 +0200)
committerNiki Roo <niki@nikiroo.be>
Fri, 10 Apr 2020 17:12:41 +0000 (19:12 +0200)
commit2e1300b9580ae1b6dded5a734c617a66a116c16d
tree36388d961c2093d33227bc0c1e9dfb17ee70a359
parent669a62833b4458bad0772debdd06921080500221
parentef98466f666072746af72a45a40274110990f8bd
Merge branch 'master' into subtree
48 files changed:
DataLoader.java
Instance.java
Main.java
VersionCheck.java
bundles/resources_core.properties
bundles/resources_core_fr.properties
library/BasicLibrary.java
library/CacheLibrary.java
library/LocalLibrary.java
library/MetaResultList.java
library/RemoteLibrary.java
library/RemoteLibraryServer.java
output/BasicOutput.java
output/Cbz.java
output/Epub.java
output/Html.java
output/InfoCover.java
output/InfoText.java
output/LaTeX.java
output/Text.java
reader/BasicReader.java
searchable/BasicSearchable.java
searchable/Fanfiction.java
searchable/MangaLel.java
supported/BasicSupport.java
supported/BasicSupportHelper.java
supported/BasicSupportImages.java
supported/BasicSupportPara.java
supported/BasicSupport_Deprecated.java
supported/Cbz.java
supported/E621.java
supported/EHentai.java
supported/Epub.java
supported/Fanfiction.java
supported/Fimfiction.java
supported/FimfictionApi.java
supported/Html.java
supported/InfoReader.java
supported/MangaHub.java
supported/MangaLel.java
supported/SupportType.java
supported/Text.java
supported/YiffStar.java
test/BasicSupportDeprecatedTest.java
test/BasicSupportUtilitiesTest.java
test/ConversionTest.java
test/LibraryTest.java
test/Test.java