diff options
author | Matthew Wild <mwild1@gmail.com> | 2019-01-07 15:42:46 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2019-01-07 15:42:46 +0000 |
commit | d999fb613c4d14fce7c8e44e884519cdc686748f (patch) | |
tree | d32929de61fb06689fe48e5c018873c5cdb4f73f /core | |
parent | d6117f484cf6e651ff0ed082987b04bb9b4fbe47 (diff) | |
parent | e9261c7228941f385a89eec8779c574bcc913a05 (diff) | |
download | prosody-d999fb613c4d14fce7c8e44e884519cdc686748f.tar.gz prosody-d999fb613c4d14fce7c8e44e884519cdc686748f.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions