Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
1  2 
platform/built-in-server/src/org/jetbrains/ide/RestService.java
platform/platform-impl/src/com/intellij/util/Urls.java