Merge remote-tracking branch 'origin/master' into mikhail.golubev/json-preview
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 15 Sep 2014 09:27:09 +0000 (13:27 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Mon, 15 Sep 2014 09:27:09 +0000 (13:27 +0400)
commit78d19c42b1bfc7eafbc8378e3591156dd271a8ef
treede0429f5374ac075d214459570598435b2d47c1b
parentb20cb95d6797aadd3d4adf978f82c430efdaf6cb
parent38b2f924159a9e17ac0223f8ca6831788b6a4fa6
Merge remote-tracking branch 'origin/master' into mikhail.golubev/json-preview
.idea/modules.xml
resources/src/idea/RichPlatformPlugin.xml