diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-03-07 20:10:19 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-03-07 20:10:19 -0300 |
| commit | 92290fa7df14fd6282b362dba39b01c562a5725c (patch) | |
| tree | 1e28404524718f6d38715ab949fc14a8f22d7887 /tox.ini | |
| parent | 399d1874fb86e72600d396cdbc64b2209eee96a0 (diff) | |
| parent | f274193b30cbe28f75a976b0fd5710f06c2c9c49 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/centralized-defer-cancel' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions