Merge "Comments and Documentation"

author Parker Berberian <pberberian@iol.unh.edu>

Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)
author Parker Berberian <pberberian@iol.unh.edu>
Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)
diff --cc config.env.sample
Simple merge
diff --cc src/laas_dashboard/settings.py
Simple merge
author	Parker Berberian <pberberian@iol.unh.edu>
	Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 6 Feb 2020 18:34:17 +0000 (18:34 +0000)
		1	2
config.env.sample	patch \|	diff1 \|	diff2 \|	blob \| history
src/laas_dashboard/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history