Commit graph

7 commits

Author SHA1 Message Date
Matthew Tretter
7759394df7 Remove Pillow (PIL is specified in setup.py) 2013-02-06 20:46:14 -05:00
Matthew Tretter
a906555c9f Merge branch 'develop' into ik-next
Conflicts:
	imagekit/__init__.py
	imagekit/conf.py
	imagekit/generators.py
	imagekit/models/fields/files.py
	imagekit/utils.py
	tests/core/tests.py
2013-02-05 23:34:05 -05:00
Matthew Tretter
8266099ae8 Clean up tests dir 2012-11-05 21:33:05 -05:00
Matthew Tretter
7c0511bd81 Test correct versions of Django
It looks like our versions ranges weren't correct.
2012-09-06 22:40:20 -04:00
Bryan Veloso
35343eaa9d Adding basepython to the tox directives. 2012-05-29 12:57:06 -07:00
Bryan Veloso
82c7d5e475 Adding Django 1.4 to tox. 2012-05-29 12:55:51 -07:00
Rich Leland
c384672f5d Added tox config file. 2012-01-06 21:08:41 -05:00