]> 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: 74eaa64 3a8b6ae)
Merge branch 'next' into initscripts-cleanup
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 25 Feb 2017 11:58:27 +0000 (12:58 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 25 Feb 2017 11:58:27 +0000 (12:58 +0100)
1  2 
lfs/cups patch | diff1 | diff2 | blob | history

diff --cc lfs/cups
Simple merge
Peter's tree of IPFire 2.x