Merge branch 'master' into server

004f5d90 · nanahira · b153709f · ee1a4979 · 2393d7c1 · 91f3c1e6
Commit 004f5d90 authored Jul 26, 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 @ 2393d7c1
+++ b/ocgcore @ 2393d7c1
-Subproject commit df7f36d8847fc560991ad8bd80ad40ea8ab8361e
+Subproject commit 2393d7c193492475d8c92d2af46ce724b3c01c9b
--- a/script @ 91f3c1e6
+++ b/script @ 91f3c1e6
-Subproject commit fa96ecf35e6502048f13da38b743189496e91435
+Subproject commit 91f3c1e65834eb835421235a4f8fbf91b34ad679