diff options
author | Kim Alvefur <zash@zash.se> | 2019-05-31 00:04:05 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-05-31 00:04:05 +0200 |
commit | 02e5f2886c45a7fd24a0ac342bbd677a4aa034df (patch) | |
tree | fec4eb7a94adb49a5976b35f5fec43de835f1990 /prosody | |
parent | 8848e1ea6c2a30a487d624c01311c8d3363a0a1a (diff) | |
parent | c2576aea62e6567c7690a17e1c33d8256f683899 (diff) | |
download | prosody-02e5f2886c45a7fd24a0ac342bbd677a4aa034df.tar.gz prosody-02e5f2886c45a7fd24a0ac342bbd677a4aa034df.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions