diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 19:36:59 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-30 19:36:59 -0300 |
| commit | 5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1 (patch) | |
| tree | 0edfeb752c97b07730131bb21863fc0858b379cd /etc/inc/xmlparse.inc | |
| parent | 487caee6a7cb2fa18367f513ca85c990be036a19 (diff) | |
| parent | 1cd94dc8b751ad0c10e51bdfe221b51f1dfb4c70 (diff) | |
| download | pfsense-5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1.zip pfsense-5e56c56dba188f1f5ac02b075ad0352fcd7ee2b1.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/captiveportal.inc
Diffstat (limited to 'etc/inc/xmlparse.inc')
| -rw-r--r-- | etc/inc/xmlparse.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc index cb01253..aa4d7e4 100644 --- a/etc/inc/xmlparse.inc +++ b/etc/inc/xmlparse.inc @@ -36,7 +36,7 @@ function listtags() { * I know it's a pain, but it's a pain to find stuff too if it's not */ $ret = explode(" ", - "alias aliasurl allowedip authserver bridged ca cacert cert clone config ". + "alias aliasurl allowedip authserver bridged ca cacert cert crl clone config ". "container columnitem build_port_path depends_on_package disk dnsserver dnsupdate ". "domainoverrides dyndns earlyshellcmd element encryption-algorithm-option ". "field fieldname hash-algorithm-option gateway_item gateway_group gif gre ". |
