Revision 155927f7 - Merge remote branch 'mainline/master' Conflicts: usr/local/www/firew... - pfSense - pfSense bugtracker

« Previous | Next »

Revision 155927f7

Added by Renato Botelho over 15 years ago

ID 155927f71d028eb2e4b73a83b6316bd17a2742df
Parent 532f800b, 2df3a71f
Child d64421fa

Merge remote branch 'mainline/master'

Conflicts:
usr/local/www/firewall_aliases.php
usr/local/www/firewall_virtual_ip.php

Changes

added
modified
copied
renamed
deleted