Mercurial > prosody-hg
diff util/xmppstream.lua @ 8068:5abb6bc45edd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Apr 2017 01:25:58 +0200 |
| parents | bf8aa0d1951c |
| children | e5d00bf4a4d5 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Apr 2017 01:25:58 +0200 |
| parents | bf8aa0d1951c |
| children | e5d00bf4a4d5 |