From 986a2f951a34c0d153792723594806595f1a9181 Mon Sep 17 00:00:00 2001
From: Dan Hensby <git@hens.by>
Date: Sat, 4 Aug 2018 08:59:12 +0200
Subject: [PATCH 1/2] Update composer.json version constraint

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3a3b7f6..93893ff 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "require": {
         "php": ">=5.6.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "4.2.1@stable",
+        "silverstripe/recipe-cms": "4.2.x-dev",
         "silverstripe-themes/simple": "~3.2.0"
     },
     "require-dev": {
@@ -26,4 +26,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}

From fcd4052a07af98aee8c23852bce72d4187def170 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Wed, 21 Nov 2018 09:10:41 +0100
Subject: [PATCH 2/2] Update Slack integration token

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 562fbc9..1eb6f74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,4 +100,7 @@ after_failure:
   - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
 
 notifications:
-  slack: silverstripeltd:Cls1xnypKBLFhv0YIRtNLzlQ
+  slack:
+    on_pull_requests: false
+    rooms:
+      secure: pr4kG5tTMqZy1DLejHd1MpPulAE7FtRvTYekWrKIbQF0SkbFz+s3v9fAk2AqCr+SxfV67M3M+sL52/q6TDjeGYJJttwA60gyfH/Qrc/ToCYP3J80Ca/hsk02mya0pF8Kpjg37XP8kNzAllR162mCwYKJgFiXO6Q1eb/aVJwiqmQ=