]> sipb.mit.edu Git - ikiwiki.git/blob - .gitattributes
Merge branch 'ready/html5'
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs