diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:57:53 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:57:53 +0200 |
commit | 7bd0f312446fb74b480becb9b3b05cee446e5752 (patch) | |
tree | ace2f23214b21ed50e4ea4ce9df4396206ee2fbc /src/main/java/eu/siacs/conversations/xmpp/stanzas | |
parent | 777dd4b51e83a32cc252e1c87e1d0632d27c87b5 (diff) | |
parent | 0dfb9bd1a06436ffb6dd7a5cfbdefa11d3ae130e (diff) |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/stanzas')
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java index daf54b513..4d16f2e5d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java @@ -9,7 +9,8 @@ public class IqPacket extends AbstractAcknowledgeableStanza { SET, RESULT, GET, - INVALID + INVALID, + TIMEOUT } public IqPacket(final TYPE type) { |