Laravel: Upgraded to version 4.2 (#37)

komarserjio · Nov 21, 2014 · 9374da3 · 9374da3
1 parent 0de4d88
commit 9374da3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
 	"keywords": ["framework", "laravel"],
 	"license": "MIT",
 	"require": {
-		"laravel/framework": "4.1.*"
+		"laravel/framework": "4.2.*"
 	},
 	"require-dev": {
         "phpunit/phpunit": "3.7.*"