projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ed2ed2 f65687e)
Merge remote-tracking branch 'origin/docker/remote-run' appcode/162.723 clion/162.724
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Thu, 2 Jun 2016 08:39:26 +0000 (11:39 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Thu, 2 Jun 2016 08:39:26 +0000 (11:39 +0300)
commit6ccd1fd3d3bf3ba3a4ef2c3a228ea034f5c66131
tree1937248d613a88f25e57e8b7b890b96536b5c92dtree
parent4ed2ed2db27e055ce5e3b397d8d38e0a369bd2c6commit | diff
parentf65687ef5e8a8024127a5613a7ebf014b076ebaacommit | diff
Merge remote-tracking branch 'origin/docker/remote-run'

Conflicts:
platform/util/resources/misc/registry.properties
platform/util/resources/misc/registry.properties diff1 | diff2 | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.