Comparison

CHANGES @ 7113:ecebc821225d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 30 Jan 2016 14:18:42 +0100
parent 7111:43328166dcf1
parent 7112:bd29742fa1ba
child 7288:389697309f59
comparison
equal deleted inserted replaced
7111:43328166dcf1 7113:ecebc821225d
25 - Lua 5.2 support 25 - Lua 5.2 support
26 - mod\_blocklist (XEP-0191) 26 - mod\_blocklist (XEP-0191)
27 - mod\_carbons (XEP-0280) 27 - mod\_carbons (XEP-0280)
28 - Asynchronous operations 28 - Asynchronous operations
29 - Pluggable connection timeout handling 29 - Pluggable connection timeout handling
30 - mod\_websocket (RFC 7395)
30 31
31 Removed 32 Removed
32 ------- 33 -------
33 34
34 - mod\_privacy (XEP-0016) 35 - mod\_privacy (XEP-0016)