mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Merge remote-tracking branch 'frewsxcv/patch-1' into feature/python34
This commit is contained in:
		
						commit
						160fbbee0c
					
				| 
						 | 
					@ -5,6 +5,7 @@ python:
 | 
				
			||||||
  - "2.7"
 | 
					  - "2.7"
 | 
				
			||||||
  - "3.2"
 | 
					  - "3.2"
 | 
				
			||||||
  - "3.3"
 | 
					  - "3.3"
 | 
				
			||||||
 | 
					  - "3.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  - DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
 | 
					  - DJANGO="https://www.djangoproject.com/download/1.7b2/tarball/"
 | 
				
			||||||
| 
						 | 
					@ -41,4 +42,7 @@ matrix:
 | 
				
			||||||
      env: DJANGO="django==1.4.11"
 | 
					      env: DJANGO="django==1.4.11"
 | 
				
			||||||
    - python: "3.3"
 | 
					    - python: "3.3"
 | 
				
			||||||
      env: DJANGO="django==1.3.7"
 | 
					      env: DJANGO="django==1.3.7"
 | 
				
			||||||
 | 
					    - python: "3.4"
 | 
				
			||||||
 | 
					      env: DJANGO="django==1.4.11"
 | 
				
			||||||
 | 
					    - python: "3.4"
 | 
				
			||||||
 | 
					      env: DJANGO="django==1.3.7"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user