Commit 9c2ae593 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.1' 

Conflicts:
	.travis.yml
parents e7f88688 0a7c541e
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