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

Merge branch 'master' into next

Browse Source 
Conflicts:
	config/rootfiles/core/58/filelists/files
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-04-09 12:15:59 +02:00
parent 818f334465 5cbbd5f1ed
commit 6560ecaa51
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/core/58/filelists/files
View File

@@ -1,7 +1,10 @@
etc/system-release
etc/issue
etc/vimrc
<<<<<<< HEAD
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
=======
>>>>>>> master