]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80a5cc5 4851bc8)
Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 19:06:13 +0000 (21:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 19:06:13 +0000 (21:06 +0200)
Conflicts:
html/cgi-bin/ddns.cgi

1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Peter's tree of IPFire 2.x