Merge branch 'release/3.0'

michaelbaudino · Sep 22, 2012 · eb4df44 · eb4df44
2 parents b35c081 + f6b9e9b
commit eb4df44
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/6th-feature-file1 b/6th-feature-file1
@@ -0,0 +1 @@
+15:46
diff --git a/6th-feature-file2 b/6th-feature-file2
@@ -0,0 +1 @@
+15:47
diff --git a/6th-feature-file3 b/6th-feature-file3
@@ -0,0 +1 @@
+16:02
diff --git a/7th-feature-file1 b/7th-feature-file1
@@ -0,0 +1 @@
+16:05
diff --git a/7th-feature-file2 b/7th-feature-file2
@@ -0,0 +1 @@
+16:11
diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@ gitflow-test
 ============
 
 This is test about gitflow methodology.
-This is version 2.1
+This is version 3.0