summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: a3a96b6021a3339523de30f67937296117862119 (plain)
1
2
3
CHANGELOG merge=union
*.js.es6 gitlab-language=javascript
doc/university/**/*.png filter=lfs diff=lfs merge=lfs -text