Commit e4907dc9 authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge branch '2.0.x' into 'master' 

2.0.1

Closes #162 and #164

See merge request !120
parents 1af13166 4ad06af7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment