Merge remote branch 'smcv/ready/transient-autoindex'
[ikiwiki.git] / .gitattributes
blob5d425843f23db3bb6970a55c953f345e3a8c8fe1
1 debian/changelog merge=dpkg-mergechangelogs