BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e442895 83c8d57)
merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:19:09 +0000 (11:19 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Oct 2014 11:19:09 +0000 (11:19 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge