Skip to content

Commit 35a1cb5

Browse files
committed
Merge branch 'master' into 1.0-release
2 parents f942050 + 38de94d commit 35a1cb5

File tree

65 files changed

+7025
-3485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+7025
-3485
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ matrix:
1616
env: DJANGO_VERSION=1.4.10
1717
install:
1818
- pip install -e .
19-
- pip install Django==$DJANGO_VERSION sqlparse
19+
- pip install Django==$DJANGO_VERSION django-discover-runner sqlparse
2020
script: make test
-56 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)