Commit c69e645e authored by Carles Tena's avatar Carles Tena
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/develop-84-yaml-configuration-file-for-hermesv3_gr_v3-0-0' into release_v3.0.0

# Conflicts:
#	hermesv3_gr/__init__.py
#	hermesv3_gr/config/config.py
parents 06a1be07 803c9c24
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment