| commit | 932d696e2b941962ab6c78ad4cdf22cb267685e5 | [log] [tgz] |
|---|---|---|
| author | Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com> | Wed Oct 28 12:32:50 2015 +0300 |
| committer | Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com> | Wed Oct 28 12:32:50 2015 +0300 |
| tree | 0c90b1b5b20b95632f68ef3bf8bce6452d6cc426 | |
| parent | 89cb995d92241c1f53aa71c14b4b4ac851a1179b [diff] | |
| parent | 59c33f47bb13ce94883a0ed7e1520da005a4c24c [diff] |
Merge branch 'python2' Conflicts: tox.ini