Merge branch 'master' into release

ssddanbrown · ssddanbrown · commit 753f6394f711 · 2016-04-12T20:09:14.000+01:00
diff --git a/config/database.php b/config/database.php
@@ -139,6 +139,6 @@
     |
     */
 
-    'redis' => $redisConfig,
+    'redis' => env('REDIS_SERVERS', false) ? $redisConfig : [],
 
 ];

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,6 @@`
`139`	`139`	`\|`
`140`	`140`	`*/`
`141`	`141`
`142`		`- 'redis' => $redisConfig,`
	`142`	`+ 'redis' => env('REDIS_SERVERS', false) ? $redisConfig : [],`
`143`	`143`
`144`	`144`	`];`