summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Fixed #19670 -- Applied CachedFilesMixin patterns to specific extensionsClaude Paroz2016-03-301-0/+1
| | | | Thanks Simon Meers for the initial patch, and Tim Graham for the review.
* Added git attribute merge=union for release notesAdam Chainz2015-06-021-0/+1
|
* Force Unix-style line-endings for some helper files in staticfiles_tests.Ramiro Morales2013-09-301-1/+4
| | | | | | This fixes eight failures in the cached storage tests under Windows. Refs #18920 and 978d4476cf.
* Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML ↵Julien Phalip2012-11-211-0/+2
templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing.