Main repository for pfSense
Go to file
Seth Mos 69be9601ac Merge remote branch 'upstream/master'
Conflicts:
	etc/inc/vslb.inc
	etc/version
2011-05-13 13:43:37 +02:00
boot Use FreeBSD specific files 2009-05-15 13:21:15 -04:00
cf/conf trigger setup wizard 2009-11-16 01:44:37 -05:00
conf.default Add the ipv6 allow tag to the default config. 2011-05-06 13:08:04 +00:00
etc Merge remote branch 'upstream/master' 2011-05-13 13:43:37 +02:00
root Add support for an automatic merge list to gitsync, properly escape user-supplied parameters, and improve error handling a bit. 2010-09-16 02:40:17 -06:00
sbin Actaully put the route adding under the conditional logic checking. Ticket #1408. 2011-05-06 21:02:30 +00:00
tmp Exclude loader.conf from being update during kernel update 2011-01-28 17:09:17 -05:00
usr Merge remote branch 'upstream/master' 2011-05-13 13:43:37 +02:00
.gitignore Added support for certificate chains to manager so that lighty can deliver them via SSL. 2009-05-24 08:36:21 +02:00