Skip to content
GitLab
Commit 9e6364e0 authored by Oriol.Tinto's avatar Oriol.Tinto
Browse files

Merge branch 'master' into 'pathlib' 

# Conflicts:
#   OTils/file_dealer.py
#   OTils/test/test.py
parents a6c63259 c7e62d95
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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