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
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment