]> git.ipfire.org Git - people/stevee/network.git/commitdiff
projects / people / stevee / network.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f96eec ab69925)
Merge remote-tracking branch 'stevee/error-if-check-fails'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 May 2013 10:54:09 +0000 (12:54 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 May 2013 10:54:09 +0000 (12:54 +0200)
1  2 
functions.config patch | diff1 | diff2 | blob | history

diff --cc functions.config
Simple merge
Stevee's network tree.