Merge branch 'master' into server

62851392 · nanahira · 4202acc1 · f09e45f7 · 482ec512 · 03cc893b
Commit 62851392 authored Jul 18, 2018 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 @ 482ec512
+++ b/ocgcore @ 482ec512
-Subproject commit 39fa84eefd13363e838a04ac2e78f4084fc64c9f
+Subproject commit 482ec51215175475bda27808aa5cb00a6e9e4f05
--- a/script @ 03cc893b
+++ b/script @ 03cc893b
-Subproject commit d7084301fb70342da470d6f828912bdd454164a2
+Subproject commit 03cc893b070a54b6643f8c36f1bdc76b546db933