Merge branch 'paz-1008-a'
[pazpar2-moved-to-github.git] / .gitattributes
1 js/pz2.js ident