Skip to content
Snippets Groups Projects
Commit 07b17ec9 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Merge branch 'master' into 'shutting-down-parts-of-the-network' 

# Conflicts:
#   bob/learn/tensorflow/estimators/Logits.py
#   bob/learn/tensorflow/estimators/Siamese.py
parents 33d4e3b6 18980c2c
Branches
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment