diff options
| author | Christian S <christian@pix-art.de> | 2016-01-17 11:46:10 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-17 11:46:10 +0100 |
| commit | ae60bc265191eeb31bd5e96b030059ec4bd84027 (patch) | |
| tree | 50b424b30a60c7ccee8cdf68398c77630da45d59 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | ebfaa84167614c7c23b0593950704a343571ee4a (diff) | |
| parent | ba143a27309657ce6694b0acaf2fb34069b79313 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
0 files changed, 0 insertions, 0 deletions