]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bc6891 ceb78c4)
Merge remote-tracking branch 'amarx/10538' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:42:32 +0000 (22:42 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:42:32 +0000 (22:42 +0200)
1  2 
config/cfgroot/general-functions.pl patch | diff1 | diff2 | blob | history
html/cgi-bin/ovpnmain.cgi patch | diff1 | diff2 | blob | history

diff --cc config/cfgroot/general-functions.pl
Simple merge
diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge
Timo's tree of IPFire 2.x