diff options
| author | Kim Alvefur <zash@zash.se> | 2017-10-05 18:06:04 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-10-05 18:06:04 +0200 |
| commit | 4730aead9e3dcc0096ffb73f9b31f87b0069ad8c (patch) | |
| tree | 691fe346b53e4d17c388e45cd54dd15bf8f6bb06 /core | |
| parent | 5970fb161e2c811c59d0b0a512c8f8a756a7814a (diff) | |
| parent | 621ee7226fc62b872cb6b74797b97ee509d620c8 (diff) | |
| download | prosody-4730aead9e3dcc0096ffb73f9b31f87b0069ad8c.tar.gz prosody-4730aead9e3dcc0096ffb73f9b31f87b0069ad8c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions