From 6cdd302eae0672a6e9d357b0b2f907c5e34fda2a Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Thu, 10 Mar 2016 20:36:38 +0200
Subject: [PATCH] Post merge fix

---
 composer.lock | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index d42505907..161f8d22a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8502cb99b66fc169c2441f9d88524b52",
-    "content-hash": "975a6569f9c89e4c2ee84687517e44ce",
+    "hash": "dafb943040964731630ab4992b1ea540",
+    "content-hash": "93e9fc9ecc82e91296f8a21aa9756123",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -634,16 +634,16 @@
         },
         {
             "name": "rockettheme/toolbox",
-            "version": "1.3.0",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "034bc18226921e49867ea14a9b9a39baafce5c04"
+                "reference": "e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/034bc18226921e49867ea14a9b9a39baafce5c04",
-                "reference": "034bc18226921e49867ea14a9b9a39baafce5c04",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b",
+                "reference": "e3468ec2dfb8c832f7d9ae508af445ea3fbaf54b",
                 "shasum": ""
             },
             "require": {
@@ -678,7 +678,7 @@
                 "php",
                 "rockettheme"
             ],
-            "time": "2016-03-07 18:06:15"
+            "time": "2016-03-10 13:16:52"
         },
         {
             "name": "symfony/console",
@@ -2618,7 +2618,8 @@
     ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "erusev/parsedown": 20
+        "erusev/parsedown": 20,
+        "rockettheme/toolbox": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,