diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
| commit | b71740f0d40ed3fb3e5b790d80ed6cb235f97d04 (patch) | |
| tree | 99367303fb7b92cb1f34d8c236ad53c31c1d4bb4 /src/main/java/eu/siacs/conversations/entities/Contact.java | |
| parent | 8f93f9c314d1bf731eac64007f3c9459fa92de1f (diff) | |
| parent | cacddef75668c1811d951795c2276c20255c9142 (diff) | |
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Contact.java')
0 files changed, 0 insertions, 0 deletions