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/ipblocklist/8/countryblock_IPBlocklist.widget.tmp | |
| 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/ipblocklist/8/countryblock_IPBlocklist.widget.tmp')
| -rw-r--r-- | config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp index a62fcede..546e27c4 100644 --- a/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp +++ b/config/ipblocklist/8/countryblock_IPBlocklist.widget.tmp @@ -1,7 +1,7 @@ <?php /* Copyright 2011 Thomas Schaefer - Tomschaefer.org - Part of pfSense widgets (www.pfsense.com) + Part of pfSense widgets (www.pfsense.org) Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |