Skip to content
GitLab
Commit fe4bd961 authored by Carles Tena's avatar Carles Tena
Browse files

Merge remote-tracking branch 'remotes/origin/develop-43-first-time-option' 

# Conflicts:
#	hermesv3_bu/hermes.py
parents 0a7287a0 8214182e
Hide whitespace changes
Inline Side-by-side
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