Merge branch 'mikhail.golubev/json-preview'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 17 Sep 2014 09:33:09 +0000 (13:33 +0400)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Wed, 17 Sep 2014 09:33:09 +0000 (13:33 +0400)
commitde8e320a087b82a2586b91fd2510e96b910a40e4
tree544767eb0e885dfbb60977d208ad76c6fd290074
parentfd12a9b5298a054260d864b0fa675839b5721364
parent2618053c443da95008c57acf12e8eab50e4ce802
Merge branch 'mikhail.golubev/json-preview'
resources/src/idea/RichPlatformPlugin.xml