diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:45:35 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:45:35 -0300 |
| commit | ab07ca181d1223de148838a087d926f050d6f49b (patch) | |
| tree | 43c8cdaa1b8e58919ce562ac079dbc9369aeab0f /conf.default | |
| parent | 6896444b50b50c187c69fedc511264cff5df1c44 (diff) | |
| parent | 111887664a131d3fa1b45e089676802ef71efcf7 (diff) | |
| download | pfsense-ab07ca181d1223de148838a087d926f050d6f49b.zip pfsense-ab07ca181d1223de148838a087d926f050d6f49b.tar.gz | |
Merge remote branch 'mainline/master' into 3_interfaces
Conflicts:
usr/local/www/firewall_aliases.php
usr/local/www/firewall_aliases_edit.php
usr/local/www/firewall_aliases_import.php
usr/local/www/firewall_nat.php
usr/local/www/firewall_nat_1to1.php
usr/local/www/firewall_nat_1to1_edit.php
usr/local/www/firewall_nat_edit.php
usr/local/www/firewall_nat_out.php
usr/local/www/firewall_nat_out_edit.php
usr/local/www/firewall_rules.php
usr/local/www/firewall_rules_edit.php
usr/local/www/firewall_schedule.php
usr/local/www/firewall_schedule_edit.php
usr/local/www/firewall_shaper.php
usr/local/www/firewall_shaper_layer7.php
usr/local/www/firewall_shaper_vinterface.php
usr/local/www/firewall_shaper_wizards.php
usr/local/www/firewall_virtual_ip.php
usr/local/www/firewall_virtual_ip_edit.php
Diffstat (limited to 'conf.default')
0 files changed, 0 insertions, 0 deletions
