diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-03-07 20:08:44 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-03-07 20:08:44 -0300 |
commit | 399d1874fb86e72600d396cdbc64b2209eee96a0 (patch) | |
tree | c0f24450b9225110bd092794c05a004cf1b3c59d /.tx/config | |
parent | 430cb6d98ca230db28c1509977307679fb0bf767 (diff) | |
parent | 17fcf4f3efd1c016bd0f93129b4bedfd8ca92309 (diff) |
Merge remote-tracking branch 'refs/remotes/ivan/bug/better-soledad-retry' into develop
Diffstat (limited to '.tx/config')
0 files changed, 0 insertions, 0 deletions