Merge branch 'master' into dev

src/paperless/urls.py

@@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
 from rest_framework.routers import DefaultRouter
 
+from paperless.views import FaviconView
 from documents.views import (
     CorrespondentViewSet,
     DocumentViewSet,
@@ -46,6 +47,9 @@ urlpatterns = [
     # File uploads
     url(r"^push$", csrf_exempt(PushView.as_view()), name="push"),
 
+    # Favicon
+    url(r"^favicon.ico$", FaviconView.as_view(), name="favicon"),
+
     # The Django admin
     url(r"admin/", admin.site.urls),