diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-04 17:23:51 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-04 17:23:51 +0100 |
| commit | d7ac9b88cf608e9a1dd66af8149264f89ba9678d (patch) | |
| tree | 054c0b5439f75161d18ae883d6f2ca9c046d5aa1 /src/main/java/eu/siacs/conversations | |
| parent | 0c804af1bc22c5aaf95c3bbf53964d43a431b46f (diff) | |
| parent | 4f34a8f73fa35d223cdad0df3ac93839ffbf2371 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions