Merge remote-tracking branch 'origin/intellij14.1' into intellij15

# Conflicts: # gradle.properties
uwolfer · May 10, 2016 · 855f7f8 · 855f7f8
2 parents d624aba + 4611e07
commit 855f7f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 ideaVersion=IC-15.0.5
-ijPluginRepoChannel=rc
+ijPluginRepoChannel=
 downloadIdeaSources=false
-version=0.9.8-142-rc
+version=0.9.8-142
 javaVersion=1.6