Merge branch 'master' into feature/flake8

This commit is contained in:
Siarhei Puhach 2017-06-29 18:56:50 +03:00 committed by GitHub
commit fcc109b8f5
15 changed files with 701 additions and 372 deletions

View file

@ -513,3 +513,8 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT')
# The endpoint to which the XML RPC request needs to be sent to. The
# default value is /RPC2
OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT')
# dcl email configurations
DCL_TEXT = env('DCL_TEXT')
DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')