Merge branch 'master' into server

ee280c83 · nanahira · bbf6fcf8 · 230a7920 · 18edd6be · 1f0a3ebf
Commit ee280c83 authored Nov 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 @ 18edd6be
+++ b/ocgcore @ 18edd6be
-Subproject commit 565f2fa94dd4caead3345b3257e1bcaacd760e72
+Subproject commit 18edd6bec8b6e876cddb296989993b9009f54bbe
--- a/script @ 1f0a3ebf
+++ b/script @ 1f0a3ebf
-Subproject commit 504b791745b2dd6aedfd9f13bc4d2f60da443557
+Subproject commit 1f0a3ebfb3957b968d1acd26d2bc75e81b8475ad