]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - .gitattributes
Merge remote branch 'upstream/master' into prv/po
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs