diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-26 16:17:16 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-26 16:17:16 -0300 |
| commit | d9a0c4b8e86b193821b67783982e66370b399629 (patch) | |
| tree | a38c6290dbdd9854c57f73dd001d1e9901a53d1e /usr/local/www/carp_status.php | |
| parent | 188097024801509c431899e7d9d4382e0a05b204 (diff) | |
| parent | 4cb9abc3dc4b1faf42f4f8607772f9b652341209 (diff) | |
| download | pfsense-d9a0c4b8e86b193821b67783982e66370b399629.zip pfsense-d9a0c4b8e86b193821b67783982e66370b399629.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/services_rfc2136.php
usr/local/www/services_snmp.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_rrd_graph_settings.php
Diffstat (limited to 'usr/local/www/carp_status.php')
| -rwxr-xr-x | usr/local/www/carp_status.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 793a9ae..44dee95 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -107,7 +107,7 @@ include("head.inc"); <p> <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td class="listhdrr"><b><center>Carp Interface</center></b></td> + <td class="listhdrr"><b><center>CARP Interface</center></b></td> <td class="listhdrr"><b><center>Virtual IP</center></b></td> <td class="listhdrr"><b><center>Status</center></b></td> </tr> |
