]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e4521 c26171b)
Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:19 +0000 (00:39 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:19 +0000 (00:39 +0000)
1  2 
config/rootfiles/oldcore/96/update.sh patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/oldcore/96/update.sh
Simple merge
IPFire 2.x development tree