diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
| commit | 52fec558adb2b4d9bb3df314fd919570e7198e26 (patch) | |
| tree | 524f316aaddd19363ef42be2cec660f4a50e56cd /src/main/java/eu/siacs/conversations/utils/Xmlns.java | |
| parent | 61149411c5141f2f9afe9b050ddce28c9d3df202 (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
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 a19ec791..ad30b3e6 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"; } |