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)
1  2 
.idea/modules.xml
python/pluginResources/META-INF/plugin.xml

Simple merge