Revision 270f81d9 - Merge remote branch 'mainline/master' into 2_firewall Conflicts: usr... - pfSense - pfSense bugtracker

« Previous | Next »

Revision 270f81d9

Added by Renato Botelho almost 15 years ago

ID 270f81d9607be5f372a4bb89bbb53dd1e45a1f82
Parent 416686be, 073a2697
Child 96aa8f61

Merge remote branch 'mainline/master' into 2_firewall

Conflicts:
usr/local/www/diag_nanobsd.php
usr/local/www/diag_packet_capture.php
usr/local/www/firewall_shaper.php

Changes

added
modified
copied
renamed
deleted