From cd2f9fc8907f1786ca32d86f7f9ebd43cf4e138f Mon Sep 17 00:00:00 2001 From: Jeremy Bush Date: Thu, 10 Feb 2011 11:52:08 -0600 Subject: [PATCH 1/2] Fixing late night mistake on version number :( Conflicts: README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13011d7..7f4a531 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# Kohana PHP Framework, version 3.1 (dev) +# Kohana PHP Framework, version 3.1 (release) This is the current development version of [Kohana](http://kohanaframework.org/). From c6e2880ed44b64a4d81045b1544fe94e5ddf61ac Mon Sep 17 00:00:00 2001 From: Jeremy Bush Date: Thu, 17 Feb 2011 16:44:27 -0600 Subject: [PATCH 2/2] tracking submodules for hotfix --- modules/unittest | 2 +- modules/userguide | 2 +- system | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/unittest b/modules/unittest index a7d7fdb..7e8376c 160000 --- a/modules/unittest +++ b/modules/unittest @@ -1 +1 @@ -Subproject commit a7d7fdbfc2e641d9b0fa59eca4ede5b18e1fccd0 +Subproject commit 7e8376c3dd689f1404daf8a6cdf8fc71443c4d79 diff --git a/modules/userguide b/modules/userguide index 1372467..c82cd86 160000 --- a/modules/userguide +++ b/modules/userguide @@ -1 +1 @@ -Subproject commit 137246778b4b4c1b1a5c2f1eb395c5897f3651ee +Subproject commit c82cd86c295ebe0d8a6d4b1652da55ffb81b4577 diff --git a/system b/system index 3fea2fb..e7f3f67 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit 3fea2fbbcd1ac9b7318dd44e80c2c6ca02823ebe +Subproject commit e7f3f671866a35d912c262fc12b599a734725e94