projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55a4e59
8aa50f1
)
Merge branch 'topic/docker_python'
author
Alexander Koshevoy
<Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000
(17:53 +0300)
committer
Alexander Koshevoy
<Alexander.Koshevoy@jetbrains.com>
Fri, 5 Feb 2016 14:53:34 +0000
(17:53 +0300)
Conflicts:
platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java
1
2
platform/platform-resources/src/META-INF/PlatformExtensions.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/platform-resources/src/META-INF/PlatformExtensions.xml
Simple merge