From: Peter Eisentraut <peter@eisentraut.org>
Date: Wed, 8 Apr 2020 17:29:02 +0000 (+0200)
Subject: Branch off 12/13
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=2ef3054efa3760a27f24f82432b934ca62815ae4;p=pgtranslation%2Fadmin.git

Branch off 12/13

master is now version 13, and version 12 has its own branch.
---

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 3e010b8..9405edc 100644
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-12-branch		master
+messages-master			master
+messages-12-branch		REL_12_STABLE
 messages-11-branch		REL_11_STABLE
 messages-10-branch		REL_10_STABLE
 messages-9.6-branch		REL9_6_STABLE
diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index 6f15861..a0a7c09 100755
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -84,6 +84,7 @@ my %branch_status = (
     '10-branch' => 'maintenance',
     '11-branch' => 'maintenance',
     '12-branch' => 'translate this now',
+    'master' => 'future',
 );
 
 my @branches = reverse sort {
diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index d3c912e..620f488 100644
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-master	master
 postgresql-12-branch	REL_12_STABLE
 postgresql-11-branch	REL_11_STABLE
 postgresql-10-branch	REL_10_STABLE
diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index c350033..7ddb935 100755
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
 	esac
 done
 
-active_branches="12-branch 11-branch 10-branch 9.6-branch 9.5-branch"
+active_branches="master 12-branch 11-branch 10-branch 9.6-branch 9.5-branch"
 
 if [ -n "$1" ]; then
 	active_branches=$1