diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-04 13:18:06 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-04 13:18:06 +0100 |
| commit | 311628729775e2f194b7b92713e1220556585b06 (patch) | |
| tree | 43f10899307d8645eb9e5274aeefef13347bf9d1 /core | |
| parent | 0afcc05e469704c12ecc4badcdd8e0c6fbbd5b63 (diff) | |
| parent | 80ea0e0397970712819731bf3779aab24095e4fc (diff) | |
| download | prosody-311628729775e2f194b7b92713e1220556585b06.tar.gz prosody-311628729775e2f194b7b92713e1220556585b06.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions