From 9374da30e6dc52ae45b4df7021fee055a964a79e Mon Sep 17 00:00:00 2001
From: James King <james@jamesking56.co.uk>
Date: Fri, 21 Nov 2014 12:45:23 +0000
Subject: [PATCH] Laravel: Upgraded to version 4.2 (#37)

---
 laravel/notejam/app/config/app.php   | 2 ++
 laravel/notejam/app/config/queue.php | 1 +
 laravel/notejam/composer.json        | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/laravel/notejam/app/config/app.php b/laravel/notejam/app/config/app.php
index 39a29b57d..a63864d83 100644
--- a/laravel/notejam/app/config/app.php
+++ b/laravel/notejam/app/config/app.php
@@ -80,6 +80,8 @@
 
     'key' => 'J5263afFApteAj79OGkWSpGnBf0h76kF',
 
+    'crypt' => MCRYPT_RIJNDAEL_256,
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
diff --git a/laravel/notejam/app/config/queue.php b/laravel/notejam/app/config/queue.php
index 6a879f784..33589a647 100644
--- a/laravel/notejam/app/config/queue.php
+++ b/laravel/notejam/app/config/queue.php
@@ -55,6 +55,7 @@
 			'token'   => 'your-token',
 			'project' => 'your-project-id',
 			'queue'   => 'your-queue-name',
+            'encrypt' => false
 		),
 
 		'redis' => array(
diff --git a/laravel/notejam/composer.json b/laravel/notejam/composer.json
index bbd9be2d9..6ccce0385 100644
--- a/laravel/notejam/composer.json
+++ b/laravel/notejam/composer.json
@@ -4,7 +4,7 @@
 	"keywords": ["framework", "laravel"],
 	"license": "MIT",
 	"require": {
-		"laravel/framework": "4.1.*"
+		"laravel/framework": "4.2.*"
 	},
 	"require-dev": {
         "phpunit/phpunit": "3.7.*"