Merge tag 'v3.0.0' into develop

Finally 3.0.0
supervisorphp · Jan 13, 2015 · b6b696f · b6b696f
2 parents ef6c008 + 86b1c75
commit b6b696f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 
 
-## Unreleased
+## 3.0.0 - 2015-01-13
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "3.1-dev"
         }
     },
     "prefer-stable": true,