Merge remote-tracking branch 'origin/master'
authorDennis Ushakov <dennis.ushakov@gmail.com>
Thu, 25 Jan 2018 12:02:20 +0000 (15:02 +0300)
committerDennis Ushakov <dennis.ushakov@gmail.com>
Thu, 25 Jan 2018 12:02:20 +0000 (15:02 +0300)
commit6bc96537994a78332e74543da3a20d99740f1751
tree7e7fdbe7e77f99c26026538436709e671580ec63
parent4ed818ef96f8881adda09e8fba13c483725d2c5d
parent7986a291686f35f201ba2dea13aa66876dcc7fbf
Merge remote-tracking branch 'origin/master'
platform/util/resources/misc/registry.properties
python/src/META-INF/python-core-common.xml