Merge branch 'master' into new-merge
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Wed, 19 Aug 2015 11:07:35 +0000 (14:07 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Wed, 19 Aug 2015 11:07:35 +0000 (14:07 +0300)
1  2 
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/idea/PlatformActions.xml