Merge branch 'master' of github.com:netdisco/netdisco

This commit is contained in:
Oliver Gorwits
2018-12-30 10:53:13 +00:00
2 changed files with 4 additions and 2 deletions

View File

@@ -3,7 +3,7 @@
# DO NOT EDIT THIS FILE # DO NOT EDIT THIS FILE
# #
# Overrides should go to ~/environments/deployment.yml # Overrides should go to ~/environments/deployment.yml
# #
# https://github.com/netdisco/netdisco/wiki/Configuration has # https://github.com/netdisco/netdisco/wiki/Configuration has
# in depth explanations about each setting. # in depth explanations about each setting.

View File

@@ -2,7 +2,9 @@
# NETDISCO 2 CONFIGURATION FILE # NETDISCO 2 CONFIGURATION FILE
# #
# Settings in this file override share/config.yml # Settings in this file override share/config.yml
# See App::Netdisco::Manual::Configuration for more info. #
# https://github.com/netdisco/netdisco/wiki/Configuration has
# in depth explanations about each setting.
# ------------------ # ------------------
# ESSENTIAL SETTINGS # ESSENTIAL SETTINGS