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/server/0010-Save-Json-list-asynchronously.patch
+++ b/patches/server/0010-Save-Json-list-asynchronously.patch
@@ -1,4 +1,4 @@
-From a6a58b1cf9a25ab78cf00bca9ab050dfe9d41397 Mon Sep 17 00:00:00 2001
+From 9858a4f599533da9ebc2befca0d03d07f888f072 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: Thu, 2 Apr 2020 11:16:18 +0800