mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-04 03:27:12 -05:00 
			
		
		
		
	Merge branch 'master' into dev
This commit is contained in:
		
						commit
						04384c7037
					
				@ -34,8 +34,8 @@ urlpatterns = [
 | 
				
			|||||||
        r"^api/auth/",
 | 
					        r"^api/auth/",
 | 
				
			||||||
        include('rest_framework.urls', namespace="rest_framework")
 | 
					        include('rest_framework.urls', namespace="rest_framework")
 | 
				
			||||||
    ),
 | 
					    ),
 | 
				
			||||||
    # TODO: this does not work in django 2.0!
 | 
					
 | 
				
			||||||
    # url(r"^api/", include(router.urls, namespace="drf")),
 | 
					    url(r"^api/", include((router.urls, 'drf'))),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # File downloads
 | 
					    # File downloads
 | 
				
			||||||
    url(
 | 
					    url(
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user