diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-01 09:00:09 -0400 |
| commit | 58005e521346eea230c564aacf34b0820b9a6123 (patch) | |
| tree | 7242c84ccd28d9044a7c0f08f7ecfee952634a65 /etc/inc/globals.inc | |
| parent | e5770bc233d9a6a9a335b02490d7c4607410cd95 (diff) | |
| parent | 97c1f2684c5dd225075fec08148f084ff190af0a (diff) | |
| download | pfsense-58005e521346eea230c564aacf34b0820b9a6123.zip pfsense-58005e521346eea230c564aacf34b0820b9a6123.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
conf.default/config.xml
etc/inc/filter.inc
etc/inc/globals.inc
etc/inc/pfsense-utils.inc
etc/inc/upgrade_config.inc
usr/local/www/interfaces.php
Diffstat (limited to 'etc/inc/globals.inc')
| -rw-r--r-- | etc/inc/globals.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 3bd0de2..735ea52 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -91,7 +91,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "8.0", + "latest_config" => "8.1", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", |
