Merge branch '1.2'

optimistex · optimistex · commit e79a412f58a2 · 2017-10-18T05:05:30.000+03:00
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.1.x-dev"
+      "dev-master": "1.2.x-dev"
     }
   },
   "require": {}
