Merge branch 'server_mc' into server

91bbd927 · nanahira · cf3cc2b0 · 049d3cf7 · 91bbd927 · f79332d7
Commit 91bbd927 authored Jul 19, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

README.md README.md +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
 * 禁卡表编号
 * 卡片允许
 * 决斗模式
- * 旧规则
+ * 决斗规则编号
 * 不检查卡组
 * 不洗切卡组
 * 初始LP

--- a/ocgcore @ f79332d7
+++ b/ocgcore @ f79332d7
-Subproject commit df7f36d8847fc560991ad8bd80ad40ea8ab8361e
+Subproject commit f79332d76d1b5774fe0105e541d34c7b40e3e54a
--- a/script @ 573645ee
+++ b/script @ 573645ee
-Subproject commit ebd97b358b20e82c334a972ae3eaa42ec91329eb
+Subproject commit 573645ee990be70d8e7c7ae2fa8a8fad33e9d62e