From fd25edb2f0bc0aa99e37c2a78f1d03b2e635c9a0 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@bugsnag.com>
Date: Thu, 14 Jul 2016 21:31:07 -0700
Subject: [PATCH 1/6] Don't use settings caching in cli

---
 app/Foundation/Providers/ConfigServiceProvider.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php
index ee476356..f088cb44 100644
--- a/app/Foundation/Providers/ConfigServiceProvider.php
+++ b/app/Foundation/Providers/ConfigServiceProvider.php
@@ -35,9 +35,10 @@ class ConfigServiceProvider extends ServiceProvider
     public function boot()
     {
         $env = $this->app->environment();
+        $cli = $this->app->runningInConsole();
         $repo = $this->app->make(Repository::class);
         $cache = $this->app->make(Cache::class);
-        $loaded = $cache->load($env);
+        $loaded = $cli ? false : $cache->load($env);
 
         $this->app->terminating(function () use ($repo, $cache) {
             if ($repo->stale()) {
@@ -46,7 +47,7 @@ class ConfigServiceProvider extends ServiceProvider
         });
 
         try {
-            if ($loaded === false) {
+            if ($cli === false && $loaded === false) {
                 $loaded = $repo->all();
                 $cache->store($env, $loaded);
             }

From 6fb6641499cc58bd02b3d8898782ea290bbb9054 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 16 Jul 2016 09:54:28 +0100
Subject: [PATCH 2/6] Bump version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 76f41514..3f684d2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.4-dev
+2.3.4

From ddc846d9599455038691312fe209225fe03c6f37 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 16 Jul 2016 09:54:54 +0100
Subject: [PATCH 3/6] Back to dev

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 3f684d2d..f70451df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.4
+2.3.5-dev

From 5d70d244ce6dd1ea961fbd920989d1a75c3d8c3e Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sun, 17 Jul 2016 16:37:55 +0100
Subject: [PATCH 4/6] Update feed package. Fixes #1973

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index a2699232..87139707 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": "121ae0d23ad2d8a2d0a87c90a5102e6b",
-    "content-hash": "bd751e5a5d663a274000acd26ba97e86",
+    "hash": "1e468595f20309ca6658b805a1486282",
+    "content-hash": "4b3f3e889041139f810c76897b44722a",
     "packages": [
         {
             "name": "alt-three/badger",
@@ -2962,16 +2962,16 @@
         },
         {
             "name": "roumen/feed",
-            "version": "v2.10.3",
+            "version": "v2.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/RoumenDamianoff/laravel-feed.git",
-                "reference": "d2f51d9f0d8c699cb812c5b7edeb4804e253f691"
+                "reference": "900594412cab37515b2b53c8953af1201024e48d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/d2f51d9f0d8c699cb812c5b7edeb4804e253f691",
-                "reference": "d2f51d9f0d8c699cb812c5b7edeb4804e253f691",
+                "url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/900594412cab37515b2b53c8953af1201024e48d",
+                "reference": "900594412cab37515b2b53c8953af1201024e48d",
                 "shasum": ""
             },
             "require": {
@@ -3009,7 +3009,7 @@
                 "laravel",
                 "rss"
             ],
-            "time": "2016-06-01 18:54:03"
+            "time": "2016-07-17 13:06:35"
         },
         {
             "name": "simplesoftwareio/simple-qrcode",

From 387818dbb2261fee9c5aebf84b999922463c101b Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sun, 17 Jul 2016 16:38:24 +0100
Subject: [PATCH 5/6] Bump version

---
 VERSION       | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index f70451df..cc6c9a49 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5-dev
+2.3.5
diff --git a/composer.json b/composer.json
index 8b63aaed..df48e77d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
         "mccool/laravel-auto-presenter": "^4.3",
         "pragmarx/google2fa": "^0.7.1",
         "rcrowe/twigbridge": "^0.9.2",
-        "roumen/feed": "^2.10.3"
+        "roumen/feed": "^2.10.4"
     },
     "require-dev": {
         "alt-three/testbench": "^1.4",

From dd1a14a438221e6bfb8886e8835b0045bf6f8a6e Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sun, 17 Jul 2016 16:38:52 +0100
Subject: [PATCH 6/6] Back to dev

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index cc6c9a49..a2a044c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5
+2.3.6-dev