django-rest-framework/.travis.yml, branch 2.4.0 Web APIs for Django. Add flake8 to requirements 2014-08-19T12:42:01+00:00 Tom Christie 2014-08-19T12:42:01+00:00 19f31340627c949ca07a9e7b59299734fd991f75 






Code linting and added runtests.py
2014-08-19T12:28:07+00:00

Tom Christie

2014-08-19T12:28:07+00:00

bf09c32de8f9d528f83e9cb7a2773d1f4c9ab563












Merge master
2014-08-19T09:11:10+00:00

Tom Christie

2014-08-19T09:11:10+00:00

e385a7b8eb6e538698f28128e43fe8bfaefd4e97












Django-guardian version cleanup.
2014-07-28T06:00:50+00:00

Xavier Ordoquy

2014-07-28T06:00:50+00:00

5429c2800e263d27094ffa814589674b1b02d4f6












Merge remote-tracking branch 'origin/master' into 2.4.0
2014-06-23T12:02:45+00:00

Xavier Ordoquy

2014-06-23T12:02:45+00:00

2489e38a06f575aa144644eee683bd87f20186ef

Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini





Conflicts:
	.travis.yml
	docs/api-guide/viewsets.md
	rest_framework/serializers.py
	rest_framework/throttling.py
	tests/test_generics.py
	tests/test_serializers.py
	tox.ini







Fixed a small change in the 1.7 beta url.
2014-05-18T07:38:46+00:00

Xavier Ordoquy

2014-05-18T07:38:46+00:00

af1ee3e63175d2b1fd30ab18091bed1019ac5de6












Updated Django versions.
2014-05-18T07:27:23+00:00

Xavier Ordoquy

2014-05-18T07:27:23+00:00

a2e1024f8b0447a712d1f486172d38cfe56535fe












Enable testing on Python 3.4
2014-05-12T03:29:01+00:00

Corey Farwell

2014-05-12T03:29:01+00:00

8ecb778cd23d5d561f2e9f4a3561bb1647257a89












Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
2014-05-01T06:01:38+00:00

Xavier Ordoquy

2014-05-01T06:01:38+00:00

7b4463f73983e36f228e6af0ff8c921d4698a9b3

Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini





Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini







Merge remote-tracking branch 'reference/master' into feature/pytest
2014-04-30T20:24:01+00:00

Xavier Ordoquy

2014-04-30T20:24:01+00:00

2aca69a94601858a462060bc55154c812f70fb91

Conflicts:
	tests/test_serializer.py





Conflicts:
	tests/test_serializer.py