diff options
| author | Christian S <christian@pix-art.de> | 2016-01-04 19:46:59 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-04 19:46:59 +0100 |
| commit | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (patch) | |
| tree | 1734b88aef058e2040c5c40326b286f22d53bc59 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | 9cce7d873ab241cf50f128bda09631d226da1d48 (diff) | |
| parent | ac92023e4a8e537f09059966adaf44c035743e3c (diff) | |
Merge branch 'refs/heads/siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
0 files changed, 0 insertions, 0 deletions