Revision d21d6e20 - Merge remote-tracking branch 'mainline/master' into inc Conflicts: e... - pfSense - pfSense bugtracker

« Previous | Next »

Revision d21d6e20

Added by Vinicius Coque about 14 years ago

ID d21d6e2090c6701041b8555cdaca9ad2c949d4f1
Parent a51493d1, 042578fd
Child 45d4b71e

Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
etc/inc/interfaces.inc
etc/inc/upgrade_config.inc
etc/inc/vpn.inc

Changes

added
modified
copied
renamed
deleted