aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-01-04 22:11:21 +0100
committersteckbrief <steckbrief@chefmail.de>2016-01-04 22:11:21 +0100
commit40afa7c9ee13a7ffee6417fba9e7dda39c087165 (patch)
tree880e8e50eab234c08e73d6ac8f97f4ded43feb6e /src/main/java/eu/siacs/conversations/utils
parenteb1cad39a64ca4b38c155985f9faf8b1057a8d65 (diff)
parent65be0f1b2dd071c6629f36cc6ad392c5100b8f26 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
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 868566d9..de0a29ce 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";
}