Update CHANGELOG

mvar · mvar · commit 65a4ac7b2deb · 2016-02-01T16:05:03.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-v1.x (2016-x)
+v1.1.2 (2016-02-01)
 ---
 
 - Deprecated `FuzzyLikeThisQuery` and `FuzzyLikeThisFieldQuery` queries
diff --git a/composer.json b/composer.json
@@ -29,5 +29,11 @@
         "psr-4": {
             "ONGR\\ElasticsearchDSL\\Tests\\": "tests/"
         }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,11 @@`
`29`	`29`	`"psr-4": {`
`30`	`30`	`"ONGR\\ElasticsearchDSL\\Tests\\": "tests/"`
`31`	`31`	`}`
	`32`	`+ },`
	`33`	`+ "minimum-stability": "dev",`
	`34`	`+ "extra": {`
	`35`	`+ "branch-alias": {`
	`36`	`+ "dev-master": "1.1-dev"`
	`37`	`+ }`
`32`	`38`	`}`
`33`	`39`	`}`