diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-15 02:27:43 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-15 02:27:43 +0200 |
commit | 28ff66d12722f348b8afe7eebd018c5a0e4281a7 (patch) | |
tree | 3d260468008647fb5c3339b9fbbba5b2edc51610 /core | |
parent | 80661f1de092db42eed2e0df4457fc242f412366 (diff) | |
parent | 794f85abf55cb08c53ae0f65e3068545d22e450e (diff) | |
download | prosody-28ff66d12722f348b8afe7eebd018c5a0e4281a7.tar.gz prosody-28ff66d12722f348b8afe7eebd018c5a0e4281a7.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions