diff options
author | Christian S <christian@pix-art.de> | 2016-04-11 19:52:37 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-11 19:52:37 +0200 |
commit | a096fb7c8bdabc609f0cf9ff3786c159a048d82c (patch) | |
tree | 7b0a50d4ac6dc713b613898884a9946667b6a16a /src/main/java/eu/siacs/conversations/entities/ListItem.java | |
parent | ec870c793a3429519cc42971c45a446d946f1dd4 (diff) | |
parent | 23a0beab43a5f30baf6481afeb9188b86df0b32d (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/ListItem.java')
0 files changed, 0 insertions, 0 deletions