diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-23 14:31:08 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-23 14:31:08 +0200 |
| commit | b6e3ce4b2037b337e4e245411d8b25d61823a6c7 (patch) | |
| tree | 241f098d81dd5a5a29491293d7824b966fec51d5 /src/eu/siacs/conversations/entities/Conversation.java | |
| parent | 5c118f6dd751905ccab2d9d65f28ec8e210c484a (diff) | |
| parent | 01a03e5dedf463af624ce5922559c568b1bde4e9 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/entities/Conversation.java')
0 files changed, 0 insertions, 0 deletions