Merge branch 'master' into github-master

2016-06-16 16:03:42 +08:00
parent 6d88ddc990 64c8eb21b6
commit 0a45c7f391
13 changed files with 10 additions and 176 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "botanss"]
 	path = botanss
 	url = git@github.com:tgckpg/BotanSS.git
+[submodule "ext/utils"]
+	path = ext/utils
+	url = git@github.com:tgckpg/botansx-utils.git