Merge remote-tracking branch 'upstream/master'

c1858a2a · Marko Tibold · c509c2bf · 28ccabf1 · c1858a2a
Commit c1858a2a authored Dec 15, 2011 by Marko Tibold
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

requirements.txt
+2 -2

No files found.
--- a/requirements.txt
+++ b/requirements.txt
 # We need Django.  Duh.
 # coverage isn't strictly a requirement, but it's useful.

-Django
-coverage
+Django>=1.2
+coverage>=3.4