Skip to content
Commit 32822a11 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branch 'develop-v2.1.1' into 'issue-5' 

# Conflicts:
#   documentation/description.html
parents 240ebbeb 7462d8de
Pipeline #6357 failed with stages
in 3 minutes and 1 second