Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from netbox-community/develop 

Merge upstream changes
This commit is contained in:
Ryan Merolle 2021-02-25 12:14:16 -05:00 committed by GitHub
parent 0dec4d8df4 6cd156f7d5
commit f19d650412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/configuration.docker.py
View File

@ -45,6 +45,9 @@ def read_configurations(config_module, config_dir, main_config):
if not f.name.endswith(".py"): if not f.name.endswith(".py"):
continue continue
if f.name == f"{main_config}.py":
continue
if f.name == f"{config_dir}.py": if f.name == f"{config_dir}.py":
continue continue