mirror of
https://github.com/Nebucatnetzer/network_inventory.git
synced 2024-06-30 13:10:58 +02:00
Merge branch 'master' into htmx
This commit is contained in:
commit
4d8bfce029
|
@ -12,8 +12,8 @@
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
devShell."${system}" = pkgs.mkShell {
|
devShell = pkgs.mkShell {
|
||||||
buildInputs = [ gnumake ];
|
buildInputs = [ pkgs.gnumake ];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,19 +13,19 @@ Including another URLconf
|
||||||
1. Import the include() function: from django.urls import include, path
|
1. Import the include() function: from django.urls import include, path
|
||||||
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
|
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
|
||||||
"""
|
"""
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls import include
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'', include('backups.urls')),
|
path('', include('backups.urls')),
|
||||||
url(r'', include('computers.urls')),
|
path(r'', include('computers.urls')),
|
||||||
url(r'', include('core.urls')),
|
path(r'', include('core.urls')),
|
||||||
url(r'', include('customers.urls')),
|
path(r'', include('customers.urls')),
|
||||||
url(r'', include('devices.urls')),
|
path(r'', include('devices.urls')),
|
||||||
url(r'', include('licenses.urls')),
|
path(r'', include('licenses.urls')),
|
||||||
url(r'', include('nets.urls')),
|
path(r'', include('nets.urls')),
|
||||||
url(r'', include('users.urls')),
|
path(r'', include('users.urls')),
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
url(r'^_nested_admin/', include('nested_admin.urls')),
|
path('_nested_admin/', include('nested_admin.urls')),
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user