Merge branch 'master' into subtree
authorNiki Roo <niki@nikiroo.be>
Wed, 20 May 2020 12:18:46 +0000 (14:18 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 20 May 2020 12:18:46 +0000 (14:18 +0200)
20 files changed:
1  2 
data/MetaData.java
library/Template.java
library/WebLibraryServerHtml.java
library/web/style.css
library/web/templates/WebLibraryServerTemplates.java
library/web/templates/index.html
library/web/templates/login.html
library/web/templates/message.html
library/web/templates/viewer.html
supported/BasicSupport.java
supported/BasicSupport_Deprecated.java
supported/E621.java
supported/EHentai.java
supported/Fanfiction.java
supported/Fimfiction.java
supported/FimfictionApi.java
supported/MangaHub.java
supported/MangaLel.java
supported/Text.java
supported/YiffStar.java

Simple merge
index 0000000,3536d5f..3536d5f
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge