Revision 8c04b1ae - Merge remote branch 'mainline/master' into inc Conflicts: etc/inc/fi... - pfSense - pfSense bugtracker

« Previous | Next »

Revision 8c04b1ae

Added by Renato Botelho almost 15 years ago

ID 8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b
Parent 86385ef3, 245da543
Child f14bd707

Merge remote branch 'mainline/master' into inc

Conflicts:
etc/inc/filter.inc
etc/inc/pkg-utils.inc
etc/inc/service-utils.inc
etc/inc/system.inc
etc/inc/vpn.inc

Changes

added
modified
copied
renamed
deleted