Merge branch '3.0.x' of github.com:kohana/kohana into 3.0.x
This commit is contained in:
commit
919ae7a11d
|
@ -22,3 +22,14 @@
|
||||||
[submodule "modules/userguide"]
|
[submodule "modules/userguide"]
|
||||||
path = modules/userguide
|
path = modules/userguide
|
||||||
url = git@github.com:kohana/userguide.git
|
url = git@github.com:kohana/userguide.git
|
||||||
|
[submodule "modules/cache"]
|
||||||
|
path = modules/cache
|
||||||
|
url = git@github.com:kohana/cache.git
|
||||||
|
[submodule "modules/unittest"]
|
||||||
|
path = modules/unittest
|
||||||
|
url = git@github.com:kohana/unittest.git
|
||||||
|
[submodule "modules/oauth"]
|
||||||
|
path = modules/oauth
|
||||||
|
url = git@github.com:kohana/oauth.git
|
||||||
|
|
||||||
|
|
||||||
|
|
2
system
2
system
|
@ -1 +1 @@
|
||||||
Subproject commit a89a7a4149ba25359e4f6f025cc08772a9241d7a
|
Subproject commit 3f592b72c5512e626bdf7f49d7f4d89379493b10
|
Loading…
Reference in a new issue