diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-27 00:06:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-27 00:06:30 +0100 |
commit | bcfd7cc6f864bb4fd51226964d31e7d4423371aa (patch) | |
tree | f0a00027e5736f520eed9f29085db8e8d38926ae /core | |
parent | a5ed824a00990ccd5f2c8ae1838c13b1ad1990fc (diff) | |
parent | c03e941ccc5e429741ca485a582c6bf036cc57bf (diff) | |
download | prosody-bcfd7cc6f864bb4fd51226964d31e7d4423371aa.tar.gz prosody-bcfd7cc6f864bb4fd51226964d31e7d4423371aa.zip |
Merge
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions