aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)Author
2016-09-28Merge branch '2.7' into 2.8Tatu Saloranta
2016-01-29try to prevent merge conflicts for pom.xmlTatu Saloranta