diff options
| author | Seth Mos <seth.mos@dds.nl> | 2010-11-01 13:11:07 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2010-11-01 13:11:07 +0100 |
| commit | 11b8ca39441ad99ba661512be82589e307dae754 (patch) | |
| tree | 91378a537b72dc1d14429b76a35b2918cdc2e493 /etc/inc/services.inc | |
| parent | a8a98fb45f17db850c79f6915fb78ac5e3a60498 (diff) | |
| parent | 0e604b3abc4e8a49da7d13720482c17e017bf0bf (diff) | |
| download | pfsense-11b8ca39441ad99ba661512be82589e307dae754.zip pfsense-11b8ca39441ad99ba661512be82589e307dae754.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/filter.inc
Diffstat (limited to 'etc/inc/services.inc')
| -rw-r--r-- | etc/inc/services.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 65e50ff..2718fd2 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -869,7 +869,6 @@ function services_dyndns_configure_client($conf) { $dnsWilcard = $conf['wildcard'], $dnsMX = $conf['mx'], $dnsIf = "{$conf['interface']}"); - } function services_dyndns_configure($int = "") { |
