diff options
| author | Kim Alvefur <zash@zash.se> | 2016-08-18 17:36:46 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-08-18 17:36:46 +0200 |
| commit | 5ce8cd7c944d2e59621a79fb0fdc51a49f42af5e (patch) | |
| tree | a89e877c6e83d9aa3b79825812361591bf12bf2e /core | |
| parent | 2d2c10e83b62fbe72ac90043eca1c90d60a8cee5 (diff) | |
| parent | 33a8994b3cf6aabe428b7cdf6bba7bdf68d9c366 (diff) | |
| download | prosody-5ce8cd7c944d2e59621a79fb0fdc51a49f42af5e.tar.gz prosody-5ce8cd7c944d2e59621a79fb0fdc51a49f42af5e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions