mirror of
				https://github.com/netbox-community/netbox.git
				synced 2024-05-10 07:54:54 +00:00 
			
		
		
		
	Merge branch 'develop' into feature
This commit is contained in:
		@@ -23,15 +23,18 @@ class ConfigRevisionAdmin(admin.ModelAdmin):
 | 
			
		||||
        }),
 | 
			
		||||
        ('Banners', {
 | 
			
		||||
            'fields': ('BANNER_LOGIN', 'BANNER_TOP', 'BANNER_BOTTOM'),
 | 
			
		||||
            'classes': ('monospace',),
 | 
			
		||||
        }),
 | 
			
		||||
        ('Pagination', {
 | 
			
		||||
            'fields': ('PAGINATE_COUNT', 'MAX_PAGE_SIZE'),
 | 
			
		||||
        }),
 | 
			
		||||
        ('Validation', {
 | 
			
		||||
            'fields': ('CUSTOM_VALIDATORS',),
 | 
			
		||||
            'classes': ('monospace',),
 | 
			
		||||
        }),
 | 
			
		||||
        ('NAPALM', {
 | 
			
		||||
            'fields': ('NAPALM_USERNAME', 'NAPALM_PASSWORD', 'NAPALM_TIMEOUT', 'NAPALM_ARGS'),
 | 
			
		||||
            'classes': ('monospace',),
 | 
			
		||||
        }),
 | 
			
		||||
        ('User Preferences', {
 | 
			
		||||
            'fields': ('DEFAULT_USER_PREFERENCES',),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user