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)
1  2 
.idea/modules.xml
resources/src/idea/RichPlatformPlugin.xml

Simple merge