Merge pull request #2049 from CachetHQ/dep

Updated deps
cachethq · Aug 10, 2016 · f002575 · f002575
2 parents a947cff + e63a858
commit f002575
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": ">=5.5.9",
         "ext-xml": "*",
-        "laravel/framework": "5.2.39",
+        "laravel/framework": "5.2.42",
         "alt-three/badger": "^3.1",
         "alt-three/bus": "^1.1",
         "alt-three/emoji": "^3.1",

diff --git a/composer.lock b/composer.lock