Project

General

Profile

« Previous | Next » 

Revision c92ccac7

Added by Vinicius Coque over 14 years ago

Merge remote branch 'mainline/master' into inc

Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/filter.inc
etc/inc/gwlb.inc
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
etc/inc/shaper.inc
etc/inc/upgrade_config.inc
etc/inc/xmlparse.inc
usr/local/www/fbegin.inc

  • added
  • modified
  • copied
  • renamed
  • deleted