diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
| commit | 764182c0ca66b538cef994409f04f876681598cd (patch) | |
| tree | 2f399c618484c00f84875b437f3fcfcc9c509424 /.gitattributes | |
| parent | 8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff) | |
| parent | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff) | |
Merge commit '822898e' (Merge branch 'django14')
Conflicts:
requirements.txt
requirements_prod.txt
templates/base.html
templates/devel/clock.html
templates/public/download.html
templates/public/index.html
templates/releng/results.html
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions