Project

General

Profile

« Previous | Next » 

Revision 58005e52

Added by Jim Pingle about 14 years ago

Merge remote branch 'upstream/master'

Conflicts:
conf.default/config.xml
etc/inc/filter.inc
etc/inc/globals.inc
etc/inc/pfsense-utils.inc
etc/inc/upgrade_config.inc
usr/local/www/interfaces.php

  • added
  • modified
  • copied
  • renamed
  • deleted