]> git.deb.at Git - debienna.git/commitdiff
projects / debienna.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff9fd7d 40d1e68)
Merge branch 'master' of git.deb.at:debienna
authorchrysn <chrysn@fsfe.org>
Thu, 19 Nov 2015 19:05:13 +0000 (20:05 +0100)
committerchrysn <chrysn@fsfe.org>
Thu, 19 Nov 2015 19:05:13 +0000 (20:05 +0100)
1  2 
Kalender/2015-11-19/index.mdwn patch | diff1 | diff2 | blob | history

diff --cc Kalender/2015-11-19/index.mdwn
Simple merge