Merge branch 'develop' into feature/vm_pricing
This commit is contained in:
		
				commit
				
					
						34fcb403c7
					
				
			
		
					 309 changed files with 62025 additions and 3871 deletions
				
			
		| 
						 | 
				
			
			@ -283,9 +283,9 @@ CACHES = {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
if LOGIN_URL is None:
 | 
			
		||||
    LOGIN_URL = APP_ROOT_ENDPOINT + 'accounts/login/'
 | 
			
		||||
    LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
 | 
			
		||||
if LOGOUT_URL is None:
 | 
			
		||||
    LOGOUT_URL = APP_ROOT_ENDPOINT + 'accounts/logout/'
 | 
			
		||||
    LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
 | 
			
		||||
if LOGIN_REDIRECT_URL is None:
 | 
			
		||||
    LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue