diff options
| author | Dan McGee <dan@archlinux.org> | 2013-02-26 18:45:14 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2013-02-26 18:45:14 -0600 |
| commit | f85cc0482a44ced9aed372b8972d31040ed4043b (patch) | |
| tree | f0790247018bfa5c243fff623f917d7a7a8bf0cf /.gitignore | |
| parent | 1457f78594a25f8cfb8ad1f9b3cd6d071a3d6a93 (diff) | |
| parent | a25cc4ff459ab0070ce48730f6c6fdc227860f08 (diff) | |
Merge branch 'django-1.5'
Conflicts:
requirements.txt
requirements_prod.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions