diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-03-06 04:15:40 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-03-06 04:15:40 +0100 |
| commit | a73cc24c3f00b1e5f2fd5dc8237d8d4c699dd676 (patch) | |
| tree | 3a7add992f728cd60c933c54d0de72e1d88aed6d /src/eu/siacs/conversations/crypto | |
| parent | 1124ded2005fa5b0b9504bac383743e31212bab7 (diff) | |
| parent | 0168f185ebb209dbfb69cb19bf221354c9a8561a (diff) | |
Merge branch 'watchdog'
Diffstat (limited to 'src/eu/siacs/conversations/crypto')
0 files changed, 0 insertions, 0 deletions