Commit Graph

5 Commits

Author SHA1 Message Date
vanitasvitae 9ff0333032
Merge master 4.2.1 2017-08-14 22:15:23 +02:00
vanitasvitae 639c951fd6
Nearly completed work on Jingle SOCKS5 2017-07-21 23:05:46 +02:00
vanitasvitae 6818a52da7
Heavy reworking in progress 2017-07-19 15:17:12 +02:00
Florian Schmaus 2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +02:00
Florian Schmaus 6bb001d274 New Jingle API groundwork
A start for the new Jingle API. Since Jingle is a single IQ with many
plugable extensions, there are some particularities we need to deal
with, e.g. jingle users have to register with JingleManager.

This is untested code. There may be drangons.
2017-05-30 08:45:27 +02:00