diff options
author | Christian S <christian@pix-art.de> | 2016-04-03 21:52:50 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-03 21:52:50 +0200 |
commit | 9a8bd064f05601c0fd31e37c6751ab056d03b666 (patch) | |
tree | 57d5278bb55970a91c90851826d3e6ca3d1b7bac /src/main/java/eu/siacs/conversations/entities/Presences.java | |
parent | f732f85cd2a0c2103642d66d45bb0a44f636b33c (diff) | |
parent | 5eedce91f9d92e5139f13fddb57314570f42b9ad (diff) |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Presences.java')
0 files changed, 0 insertions, 0 deletions