Prepare release

sagikazarmark · sagikazarmark · commit 1c09aab88fec · 2016-05-04T08:04:52.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log
 
-## Unreleased
+## 1.1.0 - 2016-05-04
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
