Merging from 3.0.x

This commit is contained in:
BRMatt 2010-08-01 13:25:35 +01:00
commit fd8dbc88d3
2 changed files with 12 additions and 1 deletions

View file

@ -22,3 +22,14 @@
[submodule "modules/userguide"]
path = modules/userguide
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

@ -1 +1 @@
Subproject commit a2536efa858a327a9963f419254cef746226f2b5
Subproject commit 7039a2a11f0f75d4ea8a96c422bd3fbada39c19c