From e6b5b884f2ab7c6e6f4040ca9c0156fe6a903e87 Mon Sep 17 00:00:00 2001
From: Jose Leonan Carvalho <j.leonancarvalho@gmail.com>
Date: Wed, 24 Aug 2016 17:20:49 -0300
Subject: [PATCH] Merge origin/develop into develop

Conflicts:
	composer.json
---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 69c8541..74b0294 100644
--- a/composer.json
+++ b/composer.json
@@ -24,5 +24,10 @@
          "psr-0": {
              "Orion\\": "src/"
          }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.6-dev"
+        }
     }
 }