diff options
| author | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-26 11:17:48 +0100 |
| commit | 927dde01a827a91a24495bd868575cefd981f8c2 (patch) | |
| tree | f09ed178937f28b85d1499951cff3faa64988250 /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | 67eb44af3c5012cdc2da3af4ae94cf7fa51a3ef1 (diff) | |
| parent | 46be514b4db1cb8c17037ac6cd307078e4794a12 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
0 files changed, 0 insertions, 0 deletions