diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-05 20:54:43 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-05 20:54:43 +0200 |
| commit | 00abdfe459607977e02a616ee738306b90ab8fd6 (patch) | |
| tree | 7760f4f8fcb6ea74fffad05e021256ddade0bc0f /core | |
| parent | bac930916798b3c8b3e5e71f11750ec6836b3b41 (diff) | |
| parent | bf3fdda165bf8010773da1ee58bb3e7237044b40 (diff) | |
| download | prosody-00abdfe459607977e02a616ee738306b90ab8fd6.tar.gz prosody-00abdfe459607977e02a616ee738306b90ab8fd6.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions