diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-06 14:50:34 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-06 14:50:34 +0200 |
| commit | 26261c7a51d04fa39653c75c84b7e0566299d934 (patch) | |
| tree | cd0b43a82194a0ef7608dc95c0bfe129d63df0af /core | |
| parent | 888df39003d093377dac8e3a0cba7670d996bc07 (diff) | |
| parent | 52a8bdb8f5a075f9de7f31b64522300a1e84ccfb (diff) | |
| download | prosody-26261c7a51d04fa39653c75c84b7e0566299d934.tar.gz prosody-26261c7a51d04fa39653c75c84b7e0566299d934.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions