projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c2d0ad3
f13682a
)
Merge remote-tracking branch 'origin/master'
author
Ekaterina Tuzova
<Ekaterina.Tuzova@jetbrains.com>
Mon, 8 Sep 2014 10:39:37 +0000
(14:39 +0400)
committer
Ekaterina Tuzova
<Ekaterina.Tuzova@jetbrains.com>
Mon, 8 Sep 2014 10:39:37 +0000
(14:39 +0400)
1
2
python/edu/learn-python/resources/META-INF/plugin.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
python/edu/learn-python/resources/META-INF/plugin.xml
Simple merge