diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-07 10:49:40 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-07 10:49:40 +0100 |
| commit | 943a01b9bf8cc5c66ad094850a3f42f790cfac14 (patch) | |
| tree | 238aa877758c8a63c487257a3e2ef9360215655e /src/main/java/eu/siacs/conversations | |
| parent | a22c8c04d8c15925e6048dcc5de3d8e8eb9d7055 (diff) | |
| parent | a7ee9cc41b1df38b070086dd5451bd791d305fbb (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