Skip to content
GitLab
Explore
Sign in
Register
Telepathy
telepathy-gabble
Repository
telepathy-gabble
tests
twisted
caps
advertise-contact-caps.py
Find file
Blame
History
Permalink
Merge branch 'telepathy-gabble-0.18'
· 5db274c6
Guillaume Desmottes
authored
Oct 29, 2013
Conflicts: src/media-factory.c tests/twisted/jingle/google-relay.py
5db274c6