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

Merge branch 'subtree'
---

fb482b2cf25afe3950c74483842db18666a26ba7
diff --cc src/be/nikiroo/utils/CookieUtils.java
index 0000000,f082026..f082026
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/CookieUtils.java
+++ b/src/be/nikiroo/utils/CookieUtils.java
diff --cc src/be/nikiroo/utils/HashUtils.java
index 0000000,df8d7c6..df8d7c6
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/HashUtils.java
+++ b/src/be/nikiroo/utils/HashUtils.java
diff --cc src/be/nikiroo/utils/NanoHTTPD.java
index 0000000,8d183c1..8d183c1
mode 000000,100644..100644
--- a/src/be/nikiroo/utils/NanoHTTPD.java
+++ b/src/be/nikiroo/utils/NanoHTTPD.java