diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
| commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
| tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/diag_smart.php | |
| parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
| parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
| download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/diag_smart.php')
| -rw-r--r-- | usr/local/www/diag_smart.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/local/www/diag_smart.php b/usr/local/www/diag_smart.php index 8c3c6a0..690155e 100644 --- a/usr/local/www/diag_smart.php +++ b/usr/local/www/diag_smart.php @@ -206,6 +206,7 @@ switch($action) <td colspan="2" valign="top" class="listtopic"><?=gettext("Config"); ?></td> </tr> <tr> + <td width="22%" valign="top" class="vncell"><?=gettext("Email Address"); ?></td> <td width="22%" valign="top" class="vncell"><?=gettext("Email Adress"); ?></td> <td width="78%" class="vtable"> <input type="text" name="smartmonemail" value="<?=$pconfig['smartmonemail']?>"/> |
