Fixes patch conflict with Anti-Xray - Close GH-158

2020-04-16 00:26:01 +07:00
parent 9a3a5c67f3
commit 4b9b6169c3
24 changed files with 81 additions and 50 deletions
--- a/patches/api/0002-Add-server-configuration.patch
+++ b/patches/api/0002-Add-server-configuration.patch
@@ -1,4 +1,4 @@
-From 5a32a7baf818149553c639e88f3ee451a14ca4c6 Mon Sep 17 00:00:00 2001
+From 0fc740d0df7c774c0ad30c4c35f9e42104fec802 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
 <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800