Commit 1efe4648 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'master' into 'fixing-ci'

# Conflicts:
#   MANIFEST.in
#   bob/learn/__init__.py
#   bob/learn/tensorflow/__init__.py
parents 112bd95b 80eb72a7
Pipeline #5740 passed with stages
in 8 minutes and 43 seconds
Markdown is supported
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