summaryrefslogtreecommitdiff
path: root/.gitattributes
AgeCommit message (Expand)Author
2015-06-02Added git attribute merge=union for release notesAdam Chainz
2013-09-30Force Unix-style line-endings for some helper files in staticfiles_tests.Ramiro Morales
2012-11-21Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML temp...Julien Phalip