Jean-Louis Fuchs 34e89fa1c5 Merge branch 'dev' into get_code_fidelity ...

Conflicts:
	jedi/evaluate/docstrings.py
	jedi/parser/representation.py

Resolving merge problems:
* Introducing docstring for compiled.fake
* Partly fixing poor decision in TokenDocstring __init__

2014-01-28 00:37:06 +01:00

4.7 KiB

Raw Blame History

View Raw