diff options
author | kruks23 <scardenas@openmailbox.org> | 2014-05-17 22:03:12 +0200 |
---|---|---|
committer | kruks23 <scardenas@openmailbox.org> | 2014-05-17 22:03:12 +0200 |
commit | b79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (patch) | |
tree | 6f8f258bcfd6d52f6714ff40636b9ee3801d624c /libs/otr4j-0.10.jar | |
parent | 2abb57be34effbb0606ae099bfefee472542662e (diff) | |
parent | 66aacf7e3edae1e4a6ec6cab72df82ae38daa096 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'libs/otr4j-0.10.jar')
0 files changed, 0 insertions, 0 deletions