Merge origin/develop into develop

Conflicts: composer.json
VM9 · Aug 24, 2016 · e6b5b88 · e6b5b88
1 parent 6732bb9
commit e6b5b88
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -24,5 +24,10 @@
          "psr-0": {
              "Orion\\": "src/"
          }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.6-dev"
+        }
     }
 }