From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Thu, 16 Apr 2015 13:21:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.mdrn.pl/django-ssify
X-Git-Tag: 0.2.5~1
X-Git-Url: https://git.mdrn.pl/django-ssify.git/commitdiff_plain/325450f83527058794f7b9f5e76348afa9a06ec4

Merge branch 'master' of ssh://git.mdrn.pl/django-ssify

Conflicts:
	tox.ini
---

325450f83527058794f7b9f5e76348afa9a06ec4
diff --cc tox.ini
index 8aa3898,5954c8d..063a6b3
--- a/tox.ini
+++ b/tox.ini
@@@ -3,9 -3,8 +3,9 @@@
  #
  [tox]
  envlist=clear,
-     d1{5,6}-py{26,27,32,33},
-     d{17,18}-py{27,32,33,34},
-     d{d}-py{27,33,34},
+     d1{5,6}-py{26,27,32,33,py},
 -    d{17,d}-py{27,32,33,34,py},
++    d{17,18}-py{27,32,33,34,py},
++    d{d}-py{27,33,34,py},
      stats
  
  [testenv]
@@@ -15,15 -14,8 +15,9 @@@ deps
      d15: Django>=1.5,<1.6
      d16: Django>=1.6,<1.7
      d17: Django>=1.7,<1.8
 -    dd: https://github.com/django/django/zipball/master
 +    d18: Django>=1.8,<1.9
 +    dd: https://github.com/django/django/archive/master.tar.gz
      coverage
- basepython=
-     py26: python2.6
-     py27: python2.7
-     py32: python3.2
-     py33: python3.3
-     py34: python3.4
  
  [testenv:clear]
  basepython=python3.4