Merge branch 'master' into traff/python-facet
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 20 Feb 2017 18:14:43 +0000 (21:14 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Mon, 20 Feb 2017 18:14:43 +0000 (21:14 +0300)
commit30571693a8801dec69651f8549262d33c49f0635
treea7b941f312f59e32e3c3629ff59dcf384541519f
parent30d86b98da0eefc0a9d10ee4a2d7529bb5792c51
parent073bdf3329b27b3a1604c4411b0b572f484d4b6d
Merge branch 'master' into traff/python-facet
.idea/modules.xml
python/pluginResources/META-INF/plugin.xml