Merge branch 'master' of git@github.com:kohana/kohana

This commit is contained in:
Geert De Deckere 2010-05-03 09:24:45 +02:00
commit 62cc276dcf
9 changed files with 9 additions and 9 deletions

View file

@ -2,7 +2,7 @@
/**
* The directory in which your application specific resources are located.
* The application directory must contain the config/kohana.php file.
* The application directory must contain the bootstrap.php file.
*
* @see http://docs.kohanaphp.com/install#application
*/

@ -1 +1 @@
Subproject commit 84f12d4afc5aced5e1910bf319c40cd5d74aee2b
Subproject commit 4720c0d190f3495fe800e42fa37fefc84ed52301

@ -1 +1 @@
Subproject commit 5de7899c4c01e9e6520882c2c8035802e9e17a9d
Subproject commit d2677eeada4847f8854eaeb6fcf8c284763d423c

@ -1 +1 @@
Subproject commit 756518ea3b293af5aac23548d9fbf48e19be87a3
Subproject commit 7a288b29e6a0be841b41cfc118ce77a57687ce76

@ -1 +1 @@
Subproject commit ba7b30febf44b2345626d3ed3a9c3d11cb41011a
Subproject commit 3221dbc48f87c55a951e08ce43527c1363c186c9

@ -1 +1 @@
Subproject commit e68997366359d0fb18a20954a42c724eaa7c8fe4
Subproject commit bc1dbaf334c719c752ad9f7d5b94f8d12a21d177

@ -1 +1 @@
Subproject commit 81fe5691c4f2e206707f3e8ae2408d5ba846b8d9
Subproject commit e0621c5daf56fa6c3a50ac58746a2534a5c7a22d

@ -1 +1 @@
Subproject commit c4d5cba6db687df7702c127d73a99af257d58659
Subproject commit 30710a0c8fd6c19efed2bfb99700dbb99c3ba23e

2
system

@ -1 +1 @@
Subproject commit 56c556391fb3ec6591f90969e39ffcfcce1056d9
Subproject commit d0613592ccd7fbc88c68318c1d69288f09722148