From c8edc341eecfb1d309415863d969ecb94fa9bd5b Mon Sep 17 00:00:00 2001
From: Javier Spagnoletti <phansys@gmail.com>
Date: Fri, 24 Apr 2015 10:33:31 -0300
Subject: [PATCH] Updated composer.json: * Fixed indentation to 4 spaces *
 Removed "version" (https://getcomposer.org/doc/04-schema.md#version) * Added
 "branch-alias" in order to allow semver

---
 composer.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index ff020a2..0d99c99 100644
--- a/composer.json
+++ b/composer.json
@@ -3,11 +3,10 @@
         "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.5.1"
+        "phpunit/phpunit": "~4.5,>=4.5.1"
     },
     "name": "j7mbo/twitter-api-php",
     "description": "Simple PHP Wrapper for Twitter API v1.1 calls",
-    "version": "1.0.0",
     "type": "library",
     "keywords": [
         "twitter",
@@ -24,5 +23,10 @@
     ],
     "autoload": {
         "files": ["TwitterAPIExchange.php"]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
     }
 }