diff options
author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | |
parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index 835eef36b..b9c95e6e5 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -15,6 +15,8 @@ import java.util.TimeZone; import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; public abstract class AbstractGenerator { private final String[] FEATURES = { |