Bumped version

2015-08-06 21:51:31 +01:00
parent 2ac9d3b23e
commit f9f2e5c18a
2 changed files with 2 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
        }
    },
    "minimum-stability": "dev",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "b701865213f9b631c307c4a9dcd59f3b",
+    "hash": "79262ca16adb52349f33f5b6312137de",
    "packages": [
        {
            "name": "alt-three/emoji",