From 18a3d2856947117b9dbb476b7d27a0ee0764b6ef Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 11 Oct 2017 17:31:43 +1300
Subject: [PATCH 1/3] Remove obsolete branch-alias

---
 composer.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 2e0ea7ec..fb45e10e 100644
--- a/composer.json
+++ b/composer.json
@@ -35,10 +35,6 @@
         "se/selenium-server-standalone": "2.41.0"
     },
     "extra": {
-        "branch-alias": {
-            "4.x-dev": "4.0.x-dev",
-            "dev-master": "5.x-dev"
-        },
         "expose": [
             "client/dist",
             "client/lang"
@@ -57,4 +53,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
\ No newline at end of file

From 42cd0903df1a3ab0e9df90169a5aacbf3b537018 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 11 Oct 2017 17:46:48 +1300
Subject: [PATCH 2/3] Update translations

---
 lang/bg.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lang/bg.yml b/lang/bg.yml
index 02711d1c..38917723 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -246,6 +246,12 @@ bg:
     ReasonDropdownVPBROKENLINK: 'Виртуална страница, сочеща към несъществуваща страница'
     RedirectorNonExistent: 'Страница за пренасочване, сочеща към несъществуваща страница'
     VirtualPageNonExistent: 'Виртуална страница, сочеща към несъществуваща страница'
+  SilverStripe\CMS\Reports\EmptyPagesReport:
+    ContentGroupTitle: 'Отчети за съдържание'
+    EMPTYPAGES: 'Страници без съдържание'
+  SilverStripe\CMS\Reports\RecentlyEditedReport:
+    ContentGroupTitle: 'Отчети за съдържание'
+    LAST2WEEKS: 'Страници, редактирани през последните 2 седмици'
   SilverStripe\CMS\Search\SearchForm:
     FILTERDATEFROM: От
     FILTERDATETO: До
@@ -254,3 +260,5 @@ bg:
     PAGEFILTERDATEHEADING: 'Последна редакция'
     SEARCH: Търси
     SearchResults: 'Резултати от търсенето'
+  SilverStripe\CMS\Tasks\RemoveOrphanedPagesTask:
+    BUTTONRUN: Изпълни

From acadcadbdfdeb9272b328aa05fad424d2cf22ab1 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 12 Oct 2017 11:30:11 +1300
Subject: [PATCH 3/3] Update composer

---
 .editorconfig | 3 +++
 composer.json | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 17134ab1..ee325e21 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,9 @@ trim_trailing_whitespace = false
 indent_size = 2
 indent_style = space
 
+[composer.json]
+indent_size = 4
+
 # Don't perform any clean-up on thirdparty files
 [thirdparty/**]
 trim_trailing_whitespace = false
diff --git a/composer.json b/composer.json
index fb45e10e..a2c273cd 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "silverstripe/behat-extension": "^3@dev",
-        "silverstripe/serve": "dev-master",
+        "silverstripe/serve": "^2",
         "se/selenium-server-standalone": "2.41.0"
     },
     "extra": {
@@ -53,4 +53,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}