Skip to content
Commit 9a3c8961 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.5' into v2.5-conda 

I merge this to check if after #455 the conda build is linked to stdlibc++ or to libc++
parents b6addbe0 99585b87
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