diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-20 09:03:06 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-20 09:03:06 +0100 |
| commit | d2619fa0fada68cc7b38f826b0d4b772a4eaf413 (patch) | |
| tree | 8d9ad54a06ba38eec5021f6b9ebaf08d82d6f877 /etc/inc/config.gui.inc | |
| parent | 2db19fec13247fa12d1d2e4db5e545388031bab5 (diff) | |
| parent | 86ae36217b8baad3cfb331705fc391cf176be076 (diff) | |
| download | pfsense-d2619fa0fada68cc7b38f826b0d4b772a4eaf413.zip pfsense-d2619fa0fada68cc7b38f826b0d4b772a4eaf413.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/system.inc
Diffstat (limited to 'etc/inc/config.gui.inc')
| -rw-r--r-- | etc/inc/config.gui.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/etc/inc/config.gui.inc b/etc/inc/config.gui.inc index dda13cc..df7d2c2 100644 --- a/etc/inc/config.gui.inc +++ b/etc/inc/config.gui.inc @@ -54,11 +54,6 @@ if($config_parsed == true) else $config_parsed = true; -// Set the memory limit to 128M. When someone has something like 500+ tunnels -// the parser needs quite a bit of ram. Do not remove this line unless you -// know what you are doing. If in doubt, check with dev@ _/FIRST/_! -ini_set("memory_limit","128M"); - /* include globals from notices.inc /utility/XML parser files */ require_once('config.lib.inc'); require_once("notices.inc"); |
