summaryrefslogtreecommitdiffstats
path: root/etc/inc/globals.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-08-24 18:15:25 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-08-24 18:15:25 -0400
commitd43ad788f295023f6e7d923fa07f0928a9a270d0 (patch)
tree4c8d54143bcab1e79440ee837b57ba0395549253 /etc/inc/globals.inc
parentaf539291187b159b4c7ddab791536f59193c21ea (diff)
parent29dc1e6e81998c881c15c08c526d7de65ff8e76b (diff)
downloadpfsense-d43ad788f295023f6e7d923fa07f0928a9a270d0.zip
pfsense-d43ad788f295023f6e7d923fa07f0928a9a270d0.tar.gz
Merge branch 'master' of git://rcs.pfsense.org/pfsense/nigel-ca-chain into review/master
Conflicts: etc/inc/certs.inc etc/inc/upgrade_config.inc
Diffstat (limited to 'etc/inc/globals.inc')
-rw-r--r--etc/inc/globals.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 666f759..df162cd 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -80,7 +80,7 @@ $g = array(
"product_email" => "coreteam@pfsense.org",
"hideplatform" => false,
"debug" => false,
- "latest_config" => "5.9",
+ "latest_config" => "6.0",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "115",
"minimum_ram_warning_text" => "128 megabytes",
OpenPOWER on IntegriCloud