##// END OF EJS Templates
Merge commit '37dadeb' (most of PR #4391)...
Merge commit '37dadeb' (most of PR #4391) Conflicts: IPython/testing/iptestcontroller.py
Thomas Kluyver -
r13312:c1912cf4 merge
Show More
Name Size Modified Last Commit Author
/ IPython / qt
console
__init__.py Loading ...
base_frontend_mixin.py Loading ...
client.py Loading ...
inprocess.py Loading ...
kernel_mixins.py Loading ...
manager.py Loading ...
rich_text.py Loading ...
svg.py Loading ...
util.py Loading ...