diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 18:06:40 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 18:06:40 +0200 |
| commit | 412efe93c0988e3a130bac35802fca139787d68a (patch) | |
| tree | 882a7facc8121c3b856a54f345f8bd932aed37cc /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | 7bd0f312446fb74b480becb9b3b05cee446e5752 (diff) | |
| parent | b1f1a991906cd28ffb0c6e5a199872a1f508939a (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
0 files changed, 0 insertions, 0 deletions