Revision 4256d115 - Merge remote branch 'mainline/master' into 3_interfaces Conflicts: u... - pfSense - pfSense bugtracker

« Previous | Next »

Revision 4256d115

Added by Renato Botelho almost 15 years ago

ID 4256d115c9328d3498451e7777f5724fed5f071b
Parent f6a2c6ab, 073a2697
Child 6896444b

Merge remote branch 'mainline/master' into 3_interfaces

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

Changes

added
modified
copied
renamed
deleted