diff options
| author | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
| commit | ab37336d1edc446f17d7a7aaeb653efb170283d9 (patch) | |
| tree | 609ca7afbc7bd0c4af0344af310fa0bd352bd4ae /src/main/java/eu/siacs/conversations/utils/Xmlns.java | |
| parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
| parent | 936006173ce11111f10c0bddd66d28c439ca584e (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/Xmlns.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/Xmlns.java | 2 |
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 a19ec791f..ad30b3e63 100644 --- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java +++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java @@ -7,5 +7,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 = Config.LEGACY_NAMESPACE_HTTP_UPLOAD ? "eu:siacs:conversations:http:upload" : "urn:xmpp:http:upload"; + public static final String HTTP_UPLOAD = "urn:xmpp:http:upload"; } |