diff options
| author | Adam Chainz <adam@adamj.eu> | 2015-06-02 16:11:19 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-02 12:04:40 -0400 |
| commit | 3222fc79431c0866aa65b2a83fbbffd2c3034d08 (patch) | |
| tree | c19b2b969421c20b4e1cf3aa4e5bf5d486a0bd5a /django/utils/dateparse.py | |
| parent | 2913d6b77d8b2082dc79df5503b7dd3ddd05fcc1 (diff) | |
Added git attribute merge=union for release notes
Diffstat (limited to 'django/utils/dateparse.py')
0 files changed, 0 insertions, 0 deletions