summaryrefslogtreecommitdiffstats
path: root/src/etc/phpshellsessions
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-08-27 10:13:18 -0300
committerRenato Botelho <renato@netgate.com>2015-08-27 10:13:18 -0300
commit152d4cad19f911040a5edf9a36f4ca5d35281f2f (patch)
tree5ebac97a9edeb64f990cdae7ef052f8aea7ca2c0 /src/etc/phpshellsessions
parent1fd6ed0f6603c0361cfa4f4d0b9542b9560a34d6 (diff)
parentaee36a292a950dc7715c20590c6f3eb3749cb058 (diff)
downloadpfsense-152d4cad19f911040a5edf9a36f4ca5d35281f2f.zip
pfsense-152d4cad19f911040a5edf9a36f4ca5d35281f2f.tar.gz
Merge branch 'master' into bootstrap
Diffstat (limited to 'src/etc/phpshellsessions')
-rw-r--r--src/etc/phpshellsessions/gitsync2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index f500e9a..9f2e56b 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -20,7 +20,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge";
/* NOTE: Set branches here */
$branches = array(
- "master" => "2.2 development branch",
+ "master" => "2.3 development branch",
"build_commit" => "The commit originally used to build the image",
"bootstrap" => "Bootstrap branch"
);
OpenPOWER on IntegriCloud