projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ced42c
436ffd1
)
Merge branch 'master' of https://github.com/michaelsiepmann/intellij-community into...
author
peter
<peter@jetbrains.com>
Tue, 24 Jul 2018 10:25:46 +0000
(12:25 +0200)
committer
peter
<peter@jetbrains.com>
Tue, 24 Jul 2018 10:25:46 +0000
(12:25 +0200)
1
2
platform/platform-resources/src/META-INF/LangExtensions.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/platform-resources/src/META-INF/LangExtensions.xml
Simple merge