Software / code / prosody
Diff
util/xmppstream.lua @ 7717:9c8eb0239eef
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 05 Nov 2016 00:28:30 +0100 |
| parent | 7240:bf8aa0d1951c |
| child | 8382:e5d00bf4a4d5 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 05 Nov 2016 00:28:30 +0100 |
| parent | 7240:bf8aa0d1951c |
| child | 8382:e5d00bf4a4d5 |