From c2a86c55e681977b4c9f513e891a6fa63e679545 Mon Sep 17 00:00:00 2001
From: Vitalii Nagara <duke@ejoom.com>
Date: Sun, 20 Apr 2014 22:45:21 +0300
Subject: Update composer.json

Update minor version of alias to proper.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 92056297a..82efb816c 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
   "license": "MIT",
   "extra": {
     "branch-alias": {
-      "dev-master": "3.0.x-dev"
+      "dev-master": "3.1.x-dev"
     }
   }
 }
-- 
cgit v1.2.3


From 53b8254fe01ebcd1b0b1f163e65cc231cb2a772a Mon Sep 17 00:00:00 2001
From: Arnold Daniels <arnold@jasny.net>
Date: Thu, 5 Jun 2014 13:24:56 +0200
Subject: Added  directive for composer

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 82efb816c..1b8146d60 100644
--- a/composer.json
+++ b/composer.json
@@ -30,5 +30,8 @@
     "branch-alias": {
       "dev-master": "3.1.x-dev"
     }
+  },
+  "replace": {
+    "twitter/bootstrap": "self.version"
   }
 }
-- 
cgit v1.2.3


From ff6b279b3cd37e7e4e6bd93535afd016f6957afc Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 26 Jun 2014 09:13:24 -0700
Subject: bump to v3.2.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 1b8146d60..1820b2f10 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
   "license": "MIT",
   "extra": {
     "branch-alias": {
-      "dev-master": "3.1.x-dev"
+      "dev-master": "3.2.x-dev"
     }
   },
   "replace": {
-- 
cgit v1.2.3