diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:11:57 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:11:57 -0300 |
commit | 4daa45d861ab448da4fdc910619a4ab6b213bc50 (patch) | |
tree | 4a432f7120d120443156e3cf3cf950d74f30ada8 /usr/local/www/services_rfc2136.php | |
parent | eb4ae8913eb745580cc0b5da2fb74d6f9590961c (diff) | |
parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
download | pfsense-4daa45d861ab448da4fdc910619a4ab6b213bc50.zip pfsense-4daa45d861ab448da4fdc910619a4ab6b213bc50.tar.gz |
Merge remote branch 'mainline/master' into 4_load_balancer_and_services
Conflicts:
usr/local/www/services_captiveportal_ip_edit.php
usr/local/www/services_captiveportal_mac_edit.php
usr/local/www/services_dhcp_edit.php
usr/local/www/services_rfc2136.php
usr/local/www/services_snmp.php
Diffstat (limited to 'usr/local/www/services_rfc2136.php')
-rw-r--r-- | usr/local/www/services_rfc2136.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/services_rfc2136.php b/usr/local/www/services_rfc2136.php index f0eaabb..563ee26 100644 --- a/usr/local/www/services_rfc2136.php +++ b/usr/local/www/services_rfc2136.php @@ -48,7 +48,7 @@ if ($_GET['act'] == "del") { write_config(); - header("Location: services_dyndns.php"); + header("Location: services_rfc2136.php"); exit; } @@ -105,9 +105,9 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note");?>:<br> + <br> </strong></span> - <?=gettext("Add something meaningful here.");?> + </td> <td class="list"> </td> </tr> |