diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-16 15:01:06 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-16 15:01:06 +0200 |
| commit | 9edcca1045126ecbaf4818c4e48881e06cbbd657 (patch) | |
| tree | 9c84e822736e23aa554485003f3801e04c241efc /src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java | |
| parent | e8e0eccd82df13f1a589abce55b9e54325569223 (diff) | |
| parent | 569bc435d35e79e667045aa5ed861439ebf5363c (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java')
0 files changed, 0 insertions, 0 deletions