mirror of
				https://github.com/encode/django-rest-framework.git
				synced 2025-11-04 09:57:55 +03:00 
			
		
		
		
	Merge remote-tracking branch 'reference/master' into feature/py35_build
This commit is contained in:
		
						commit
						7fa18ba939
					
				| 
						 | 
					@ -24,7 +24,8 @@ matrix:
 | 
				
			||||||
  fast_finish: true
 | 
					  fast_finish: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install:
 | 
					install:
 | 
				
			||||||
  - pip install tox
 | 
					  # Virtualenv < 14 is required to keep the Python 3.2 builds running.
 | 
				
			||||||
 | 
					  - pip install tox "virtualenv<14"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
script:
 | 
					script:
 | 
				
			||||||
    - tox -e $TOX_ENV
 | 
					    - tox -e $TOX_ENV
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user