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)
commit612790f1dfb112db226c59da4803f3cfdac3cc40
tree8e5cd557eb221b95ef77d0f08fa11b269f148967
parentf3b88d3ea66c7e1ca99380d779962fd0095a3c6c
parentda1579ba2ef11253f56330e6994984cdbc327072
Merge branch 'master' into new-merge
platform/platform-resources-en/src/messages/ActionsBundle.properties
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/idea/PlatformActions.xml