Skip to content
Snippets Groups Projects
Commit 70411063 authored by Benjamin Bollen's avatar Benjamin Bollen Committed by GitHub
Browse files

Merge pull request #518 from benjaminbollen/release-0.16 

Resolve merge conflicts with master on release-0.16
parents 04bf1169 736d5c6b
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
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