Merge 04feac1 into 4a77d0e

dimagi · Feb 19, 2015 · 8a585eb · 8a585eb
2 parents 4a77d0e + 04feac1
commit 8a585eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
- - "2.6"
  - "2.7"
  - "3.3"
 install:

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
     url='http://github.com/dimagi/django-prbac',
     packages=['django_prbac'],
     install_requires=[
-        'django>=1.3.7',
+        'django<1.7',
         'django-json-field>=0.5.5',
         'simplejson',
         'South',