diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-14 16:41:15 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-14 16:41:15 -0400 |
| commit | e49d4564dbf6be680e4d3c91c00a798e390fa358 (patch) | |
| tree | cec495f96af3d202a02ee8c4522b076142158424 /etc/inc/globals.inc | |
| parent | 424be584c34531d52ac0da8a5e954847e158c6cf (diff) | |
| parent | 144fbff2a146d9eb3921e763f6bcc7bde39bf5f9 (diff) | |
| download | pfsense-e49d4564dbf6be680e4d3c91c00a798e390fa358.zip pfsense-e49d4564dbf6be680e4d3c91c00a798e390fa358.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/globals.inc
etc/inc/upgrade_config.inc
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 735ea52..2f9a467 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.1", + "latest_config" => "8.2", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", |
