Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 29 Jun 2016 10:56:45 +0000 (12:56 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 29 Jun 2016 10:56:45 +0000 (12:56 +0200)
commit224064427a8a76517843c785e02c028cd491aa53
tree42d810cc8706c43782d68051d8e5754200ca986e
parent476376ae44dc51c690390529ac985fcb3e917ac1
parente12a796d09762336b9e92fac4fb0a525cbb789c1
Merge remote-tracking branch 'origin/master' into develar/is
platform/core-api/core-api.iml
platform/util/resources/misc/registry.properties