Skip to content
Snippets Groups Projects
Commit 9c99e508 authored by Maja Jablonska's avatar Maja Jablonska
Browse files

Merge branch 'master' into single-pytorch-module 

# Conflicts:
#	combo/nn/regularizers/regularizer.py
#	combo/predict.py
#	combo/utils/download.py
parents a7532106 08fefc3e
Branches
Tags
1 merge request!46Merge COMBO 3.0 into master
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