Skip to content
Commit 86caebdb authored by nimrod's avatar nimrod
Browse files

Merge branch 'master' into feature/tox_env 

# Conflicts:
#	.travis.yml
parents 9d23c682 d1a9b0c6
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