Merge branch 'master' into server

d49fb1ee · nanahira · ccc32fed · d447bed8 · d49fb1ee · 29a2cc00
Commit d49fb1ee authored Jan 31, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitignore .gitignore +1 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ core*
 /*.bat
 /*.sh
+/*.sql
--- a/ocgcore @ 29a2cc00
+++ b/ocgcore @ 29a2cc00
-Subproject commit cf3a323bec3209c1a004808563b397a753a16c70
+Subproject commit 29a2cc00f49d875c519a0444e18800b947585585
--- a/script @ c2b83019
+++ b/script @ c2b83019
-Subproject commit 42931d988b99711aa1ae0b86385789db4acd76c5
+Subproject commit c2b830193b5c3a182a04b6ee90973601c27023ca