BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e175e af727c9)
merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 3 Dec 2014 16:06:09 +0000 (16:06 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 3 Dec 2014 16:06:09 +0000 (16:06 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge