1
0
forked from VimPlug/jedi
Files
jedi-fork/jedi
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
..
2014-01-14 00:08:25 +01:00
2014-01-14 11:43:56 +01:00
2014-01-15 17:35:40 +01:00
2014-01-14 00:02:09 +01:00