Merge branch 'master' into server

de049711 · nanahira · 631482df · 51ba14f7 · 08861e17 · a3860aae
Commit de049711 authored Dec 25, 2019 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 @ 08861e17
+++ b/ocgcore @ 08861e17
-Subproject commit 090fcd79236986c188fbb63b76cc029d321d3556
+Subproject commit 08861e17b64ff30e957ca4af6fac5386ab987bf7
--- a/script @ a3860aae
+++ b/script @ a3860aae
-Subproject commit 28ed449e27e98324bfd4c7bea682b8dd9d0d7f13
+Subproject commit a3860aae49746b852c1e03f8ff70acb06ff8900b