Merge branch 'master' into stage-challenge
# Conflicts: # web/src/elements/buttons/SpinnerButton.ts
This commit is contained in:
		@ -10,7 +10,7 @@ from authentik.lib.config import CONFIG
 | 
			
		||||
def get_geoip_reader() -> Optional[Reader]:
 | 
			
		||||
    """Get GeoIP Reader, if configured, otherwise none"""
 | 
			
		||||
    path = CONFIG.y("authentik.geoip")
 | 
			
		||||
    if path == "":
 | 
			
		||||
    if path == "" or not path:
 | 
			
		||||
        return None
 | 
			
		||||
    return Reader(path)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user