]> scripts.mit.edu Git - www/ikiwiki.git/blob - .gitattributes
Merge remote branch 'upstream/master' into prv/po
[www/ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs