Merge branch 'east825/py3-docstring-formatter'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 16 Nov 2015 13:56:20 +0000 (16:56 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 16 Nov 2015 13:56:20 +0000 (16:56 +0300)
1  2 
python/helpers/rest_formatter.py
python/src/com/jetbrains/python/PythonHelper.java

Simple merge