diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-16 22:48:27 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-16 22:48:27 +0100 |
| commit | ba143a27309657ce6694b0acaf2fb34069b79313 (patch) | |
| tree | 997127e2098178907aa77d45c2fd2e2267ea6cde /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | 3acaec7bcd8204c92e0ffe68301645f80b5c925d (diff) | |
| parent | 0b239243d9ae6c8b4bed7a40aef99a3bcd065e30 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
0 files changed, 0 insertions, 0 deletions