Skip to content
Snippets Groups Projects
Commit 36214cec authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'osx-10.10' into 'master' 

Update conda build config to match the defaults channel

See merge request !161
parents 33ba6512 a853b235
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
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