diff options
| author | Kim Alvefur <zash@zash.se> | 2016-11-17 23:20:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-11-17 23:20:41 +0100 |
| commit | 59e7a632af33944016e3cbdb8a787a82188314ba (patch) | |
| tree | b62d53ea2041a4fa193e4b0c160fc308c8151b8a /core | |
| parent | 07da428d332ef485dc4aea2f14cde5642fb0ba78 (diff) | |
| parent | a89c193bb2127ba3c7756bfb8a9687ac2f944821 (diff) | |
| download | prosody-59e7a632af33944016e3cbdb8a787a82188314ba.tar.gz prosody-59e7a632af33944016e3cbdb8a787a82188314ba.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions