diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-02 23:03:02 +0100 |
| commit | 8407f360939fe103a991641b0bf3b85e87d660b9 (patch) | |
| tree | 4b71bdc7622635a101579c04b2d9e0c56991df2c /core | |
| parent | a11a584a59cde70ce4f0880049b9e675d8b2e223 (diff) | |
| parent | fdf81e53aa57c68f330deecf4f97cfefb05f5044 (diff) | |
| download | prosody-8407f360939fe103a991641b0bf3b85e87d660b9.tar.gz prosody-8407f360939fe103a991641b0bf3b85e87d660b9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions