aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
committerlookshe <github@lookshe.org>2016-03-25 20:04:37 +0100
commit27c16b4b9acaad33b36145d63f6bfd7e04a3b3f1 (patch)
tree20740102fb6502dd6b130f51054a681275f44431 /src/main/java/eu/siacs/conversations/parser/PresenceParser.java
parent86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff)
parent46be514b4db1cb8c17037ac6cd307078e4794a12 (diff)
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/PresenceParser.java')
0 files changed, 0 insertions, 0 deletions