diff options
| author | Christian S <christian@pix-art.de> | 2015-07-14 09:13:08 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-14 09:13:08 +0200 |
| commit | 169b4ba97f576cb2cbd8477ea0d3d6ed40276658 (patch) | |
| tree | 74a60f38a1b170962a04fdceaa7e3726b766c291 /src/main/java/eu/siacs/conversations/entities/Contact.java | |
| parent | c0016b6fa7b778700c21e15baff58b03b1b1f8d6 (diff) | |
| parent | ffffca10f0c3e399fbbcde200ea4758acc5ba03f (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into siacs-development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions