Skip to content
GitLab
Commit 6c4a5a5a authored by Pablo Escobar Lopez's avatar Pablo Escobar Lopez
Browse files

Merge pull request #45 from boegel/latest-ipython 

fix conflicts in IPython 4.1.0 dependencies
parents bdb97bbf dcd82605
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