mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 15:34:16 +00:00
Code Issues 24 Releases Wiki Activity
22,000 Commits 28 Branches 423 Tags 636 MiB
b49cc86643
Commit Graph

3 Commits

Author SHA1 Message Date
Adam Chainz
3222fc7943 Added git attribute merge=union for release notes 2015-06-02 12:04:40 -04:00
Ramiro Morales
4372718e83 Force Unix-style line-endings for some helper files in staticfiles_tests. 
This fixes eight failures in the cached storage tests under Windows.

Refs #18920 and 978d4476cf.
 2013-09-30 22:14:54 -03:00
Julien Phalip
978d4476cf Fixed #18920 -- Added .gitattributes to normalize line endings in HTML 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. 2012-11-21 10:19:00 +01:00