##// END OF EJS Templates
Merge branch 'master' of https://github.com/avandever/ipython Conflicts: IPython/core/completerlib.py
Andrew Vandever -
r8542:f4417849 merge
Show More
Name Size Modified Last Commit Author
/ IPython / parallel / controller
__init__.py Loading ...
dependency.py Loading ...
dictdb.py Loading ...
heartmonitor.py Loading ...
hub.py Loading ...
mongodb.py Loading ...
scheduler.py Loading ...
sqlitedb.py Loading ...