webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2016-02-17 19:45:08 +01:00
parent 879458d41f 1ffbca6e4f
commit 802b916d10
82 changed files with 11701 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/99/exclude
View File

@@ -1,6 +1,7 @@
boot/config.txt
etc/alternatives
etc/collectd.custom
etc/default/grub
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf