From f51ec4236e4e5bf984138f5ef8ece2f3e22d3492 Mon Sep 17 00:00:00 2001 From: Franco Springveldt Date: Fri, 25 Aug 2017 16:44:46 +1200 Subject: [PATCH 1/2] Update translations --- lang/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/en.yml b/lang/en.yml index 676fe0e..8bf285c 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -23,7 +23,7 @@ en: PAGEOWNERGROUPS: Groups PAGEOWNERUSERS: Users REVIEWFREQUENCY: 'Review frequency' - REVIEWFREQUENCYDESCRIPTION: 'The review date will be set to this far in the future, whenever the page is published.' + REVIEWFREQUENCYDESCRIPTION: 'The review date will be set to this far in the future whenever the page is published' REVIEWHEADER: 'Content review' REVIEWNOTES: 'Review notes' REVIEWSUCCESSFUL: 'Content reviewed successfully' From ede6988cc1fb0a481ee713e527674f25fa21c6f9 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 6 Sep 2017 16:58:12 +1200 Subject: [PATCH 2/2] Update branch alias --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 701b53a..261c146 100644 --- a/composer.json +++ b/composer.json @@ -27,5 +27,9 @@ "suggest": { "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" }, - "extra": [] + "extra": { + "branch-alias": { + "3.x-dev": "3.1.x-dev" + } + } }