##// END OF EJS Templates
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py
updating my code to incorporate upstream changes; resolved a merge conflict in IPython/lib/display.py

File last commit:

r8083:2b342f1c
r8798:c1e52e56 merge
Show More
index.txt
15 lines | 246 B | text/plain | TextLexer
.. _config_index:
===============================
Configuration and customization
===============================
.. toctree::
:maxdepth: 2
overview.txt
extensions/index.txt
ipython.txt
integrating.txt
editors.txt
old.txt