projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 901c6d1 b24115a)
Merge remote-tracking branch 'origin/PY-9727' into PY-9727
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 8 Dec 2015 18:20:50 +0000 (21:20 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 8 Dec 2015 18:20:50 +0000 (21:20 +0300)
# Conflicts:
# python/src/com/jetbrains/python/testing/tox/PyToxCommandLineState.java
# python/src/com/jetbrains/python/testing/tox/PyToxConfiguration.java
# python/src/com/jetbrains/python/testing/tox/PyToxConfigurationSettings.java


Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.