]> 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: 5167bb0 9ba3be2)
Merge remote-tracking branch 'origin/master' into core89 core89
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 18 Apr 2015 12:27:13 +0000 (14:27 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 18 Apr 2015 12:27:13 +0000 (14:27 +0200)
1  2 
config/rootfiles/core/89/update.sh patch | diff1 | diff2 | blob | history

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