Merge remote branch 'smcv/conference'

diff --git a/data/Empathy.Auth.client b/data/Empathy.Auth.client
index 9b86a8b763b78e0ddc6a9b83c750d34a53ece8cb..4c6adc0deb60b386fb34c1f999761ff213e46e36 100644 (file)
--- a/data/Empathy.Auth.client
+++ b/data/Empathy.Auth.client
@@ -2,5 +2,5 @@
 Interfaces=org.freedesktop.Telepathy.Client.Handler
 
 [org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.DRAFT
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection
 org.freedesktop.Telepathy.Channel.TargetHandleType u=0