Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-maertens committed Aug 28, 2016
2 parents b422560 + 2447903 commit 847c372
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ deps=
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10a1,<1.11
django110: Django>=1.10,<1.11
py26: unittest2
django13,django14: six
coverage
Expand Down

0 comments on commit 847c372

Please sign in to comment.