Software / code / prosody
Comparison
core/s2smanager.lua @ 7099:8e64e7b82928
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 22 Jan 2016 15:03:02 +0100 |
| parent | 6779:6236668da30a |
| child | 7452:d916703d5e18 |
| child | 7947:24170d74b00b |
comparison
equal
deleted
inserted
replaced
| 7091:1c3b38f80571 | 7099:8e64e7b82928 |
|---|