Merge remote-tracking branch 'origin/master' into amakeev/debugger
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Mon, 30 May 2016 12:56:44 +0000 (14:56 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Mon, 30 May 2016 12:56:44 +0000 (14:56 +0200)
1  2 
platform/platform-resources/src/brokenPlugins.txt

index 65c78d8ead8efaf4b3238c035206a700af87fc7e,8160bea433df96553c5e46ab04aaae78d8651c0a..b0df3bcebde13e87c05972d65c94890180b344d2
@@@ -51,7 -51,8 +51,8 @@@ com.sencha.idea.IdeaPlugin 6.0.6.456 6.
  com.intellij.swift 144.SNAPSHOT
  SpellChecker 1.0
  com.fedot.idea.requirejs 0.24
 -com.widerwille.quicklook 0.8
 +com.widerwille.quicklook 0.8 0.9
  com.phpuaca 1.3.1 1.2.1
  coffeescript-idea 0.1-1-gae5a
- RESTClient 1.2
+ RESTClient 1.2
+ krasa.nonProjectFilesUnlocker 1.0 1.1