aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-09-15 10:38:52 +0200
committerChristian S <christian@pix-art.de>2015-09-15 10:38:52 +0200
commiteb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch)
tree18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/java/eu/siacs/conversations/utils
parent58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff)
parent183dad281c6d610b8a4cffa1f13c923a6e423355 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/Xmlns.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/Xmlns.java b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
index 868566d96..de0a29ce2 100644
--- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java
+++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java
@@ -5,5 +5,5 @@ public final class Xmlns {
public static final String ROSTER = "jabber:iq:roster";
public static final String REGISTER = "jabber:iq:register";
public static final String BYTE_STREAMS = "http://jabber.org/protocol/bytestreams";
- public static final String HTTP_UPLOAD = "eu:siacs:conversations:http:upload";
+ public static final String HTTP_UPLOAD = "urn:xmpp:http:upload";
}