summaryrefslogtreecommitdiffstats
path: root/python/conda
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-03-01 14:47:43 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-03-01 14:47:43 +0100
commit0db21a84dd3cb0f6a78bd462a4a60a4b4a3c6fae (patch)
treea833d4787504e8612282a82c60d3984be51bdffe /python/conda
parentda11f9e7c7559eb01cc422ac55c9f7a1cd4bb803 (diff)
parentb74e64aef7845666d27cbf7e876a6a360eefed7f (diff)
downloadastra-0db21a84dd3cb0f6a78bd462a4a60a4b4a3c6fae.tar.gz
astra-0db21a84dd3cb0f6a78bd462a4a60a4b4a3c6fae.tar.bz2
astra-0db21a84dd3cb0f6a78bd462a4a60a4b4a3c6fae.tar.xz
astra-0db21a84dd3cb0f6a78bd462a4a60a4b4a3c6fae.zip
Merge branch 'master' into indexmanager
Diffstat (limited to 'python/conda')
0 files changed, 0 insertions, 0 deletions