summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-02-26 18:45:14 -0600
committerDan McGee <dan@archlinux.org>2013-02-26 18:45:14 -0600
commitf85cc0482a44ced9aed372b8972d31040ed4043b (patch)
treef0790247018bfa5c243fff623f917d7a7a8bf0cf /AUTHORS
parent1457f78594a25f8cfb8ad1f9b3cd6d071a3d6a93 (diff)
parenta25cc4ff459ab0070ce48730f6c6fdc227860f08 (diff)
Merge branch 'django-1.5'
Conflicts: requirements.txt requirements_prod.txt
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions