From b1875ea1afbbb800e856bfe56703cb06c5063e4b Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Fri, 17 Nov 2017 11:37:41 +0000
Subject: [PATCH 1/4] Loosen PHPUnit constraints

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 576d730..94b1ddb 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
 		"silverstripe-themes/simple": "3.1.*"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "~3.7@stable"
+		"phpunit/phpunit": "^3 || ^4 || ^5"
 	},
 	"extra": {
 		"branch-alias": {

From 2d90647410028a5ba2151095922f537f8223205a Mon Sep 17 00:00:00 2001
From: aNickzz <nick.360@hotmail.com>
Date: Thu, 30 Nov 2017 22:03:34 +1030
Subject: [PATCH 2/4] Update .gitignore

Uploading files directly through the Files LeftAndMain drops them directly into the assets folder by default. This will help prevent those files accidentally ending up in git.
---
 assets/.gitignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/.gitignore b/assets/.gitignore
index d826e24..8c0dc7c 100644
--- a/assets/.gitignore
+++ b/assets/.gitignore
@@ -1,4 +1,4 @@
-# Ignore sensible defaults
-/*/
-/error-*.html
-/_combinedfiles/
+/**/*
+!.gitignore
+!.htaccess
+!web.config

From 68fdb0684efbabb8ab33badea0ee3a5ba80abc87 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 6 Dec 2017 15:42:10 +1300
Subject: [PATCH 3/4] Add .cow.json to 3.5 branch

---
 .cow.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .cow.json

diff --git a/.cow.json b/.cow.json
new file mode 100644
index 0000000..10503a0
--- /dev/null
+++ b/.cow.json
@@ -0,0 +1,19 @@
+{
+  "github-slug": "silverstripe/silverstripe-installer",
+  "changelog-holder": "silverstripe/framework",
+  "changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md",
+  "child-stability-inherit": true,
+  "dependency-constraint": "exact",
+  "vendors": [
+    "silverstripe"
+  ],
+  "archives": [
+    {
+      "recipe": "silverstripe/installer",
+      "files": [
+        "SilverStripe-cms-v{version}.zip",
+        "SilverStripe-cms-v{version}.tar.gz"
+      ]
+    }
+  ]
+}

From 75984719dba5e2be8321af03fd777bc3291cc061 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 6 Dec 2017 16:22:20 +1300
Subject: [PATCH 4/4] Ignore modules

---
 .gitignore | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50e5d86..1c36369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@
 # ignore all environment files
 _ss_environment.php
 
-# ignore build tools
-/tools/phing-metadata
-
 # ignore composer vendor folder
 /vendor/
+/framework/
+/cms/
+/assets/
+/siteconfig/
+/reports/