Merge branch 'master' into server

83ffd647 · nanahira · 1a5589fd · 3e578982 · 417edca6 · 8b82a865
Commit 83ffd647 authored Aug 21, 2021 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/ocgcore @ 417edca6
+++ b/ocgcore @ 417edca6
-Subproject commit ac59c3d9c89d019adca39059948ceec8d3dd64f7
+Subproject commit 417edca61cfadad2d6d03a002dcc93012b35579a
--- a/script @ 8b82a865
+++ b/script @ 8b82a865
-Subproject commit 2f46131b596d654c8620f9733eec0b671dee1c2f
+Subproject commit 8b82a865db02c71e7910555cfd06eb388a6fc387