Comparison

CHANGES @ 7857:db48b1697234

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 23 Jan 2017 19:34:14 +0100
parent 7822:4caaa0c185f1
parent 7853:8c3de36568dd
child 8290:1ebe590c8849
comparison
equal deleted inserted replaced
7822:4caaa0c185f1 7857:db48b1697234
28 - Lua 5.2 support 28 - Lua 5.2 support
29 - mod\_blocklist (XEP-0191) 29 - mod\_blocklist (XEP-0191)
30 - mod\_carbons (XEP-0280) 30 - mod\_carbons (XEP-0280)
31 - Pluggable connection timeout handling 31 - Pluggable connection timeout handling
32 - mod\_websocket (RFC 7395) 32 - mod\_websocket (RFC 7395)
33 - mod\_mam (XEP-0313)
33 34
34 Removed 35 Removed
35 ------- 36 -------
36 37
37 - mod\_privacy (XEP-0016) 38 - mod\_privacy (XEP-0016)