Merge remote-tracking branch 'remotes/origin/pdolgov/moveReturnToComputation'
authorPavel Dolgov <pavel.dolgov@jetbrains.com>
Wed, 7 Sep 2016 14:21:40 +0000 (17:21 +0300)
committerPavel Dolgov <pavel.dolgov@jetbrains.com>
Wed, 7 Sep 2016 14:21:40 +0000 (17:21 +0300)
1  2 
resources/src/META-INF/IdeaPlugin.xml

Simple merge