From f9f2e5c18a64dc988fc6e6e5c4410e79b69eebc4 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Thu, 6 Aug 2015 21:51:31 +0100
Subject: [PATCH] Bumped version

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 21848d8a..d11ca02e 100644
--- 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",
diff --git a/composer.lock b/composer.lock
index e0e1c4ed..d21670a0 100644
--- 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",