diff options
| author | Christian S <christian@pix-art.de> | 2016-02-23 17:47:03 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-23 17:47:03 +0100 |
| commit | 5707bb9754667e6e8bc5df76f6d9e8f311b204fe (patch) | |
| tree | b604a1caf6825c586f3badb862c32af39a3a2d1b /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | cbbd85ac6b0b72dc1aeffd367093924fb3f0e052 (diff) | |
| parent | 17b1fcc3eafa078a902c662a6e774bcd7f2927b3 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
0 files changed, 0 insertions, 0 deletions