diff options
author | PiBa-NL <pba_2k3@yahoo.com> | 2014-03-19 17:10:49 +0100 |
---|---|---|
committer | PiBa-NL <pba_2k3@yahoo.com> | 2014-03-19 17:10:49 +0100 |
commit | 39b3fe5d22482d16a161193167c00af90390343a (patch) | |
tree | 53b19691d90440731195eb2325db2ecd8511feb2 /config/haproxy/haproxy_pools.php | |
parent | 2a4f986325ccd3a08273bee285993415da12aeb2 (diff) | |
parent | fd710b1c45207f551d7b0a38eb95b5b5e353ac77 (diff) | |
download | pfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.tar.gz pfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.tar.bz2 pfsense-packages-39b3fe5d22482d16a161193167c00af90390343a.zip |
Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging
Conflicts:
config/haproxy-devel/haproxy.inc
Diffstat (limited to 'config/haproxy/haproxy_pools.php')
-rwxr-xr-x | config/haproxy/haproxy_pools.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/haproxy/haproxy_pools.php b/config/haproxy/haproxy_pools.php index 52b7650d..6c2146a0 100755 --- a/config/haproxy/haproxy_pools.php +++ b/config/haproxy/haproxy_pools.php @@ -2,7 +2,7 @@ /* $Id: load_balancer_virtual_server.php,v 1.6.2.1 2006/01/02 23:46:24 sullrich Exp $ */ /* haproxy_pools.php - part of pfSense (http://www.pfsense.com/) + part of pfSense (https://www.pfsense.org/) Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com> Copyright (C) 2008 Remco Hoef <remcoverhoef@pfsense.com> All rights reserved. |