Commit cbd8df90 authored by 86d75cb97b42c802cd17c5fafed6edb8's avatar 86d75cb97b42c802cd17c5fafed6edb8

Merge branch 'master' into 'revert-2c87522a'

# Conflicts:
#   module2/exo1/toy_notebook_en.ipynb
parents 556140c7 ff5bf62e
This diff is collapsed.
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