Commit ab50b3f1 authored Feb 13, 2019 by Andreas Klöckner

Merge branch 'conda' into 'master'

Fix conda env

See merge request inducer/pyopencl!74