diff options
author | Kim Alvefur <zash@zash.se> | 2019-04-19 13:21:00 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-04-19 13:21:00 +0200 |
commit | 70bbc77e68d75584b50be3c950ab4c5aed163374 (patch) | |
tree | 85cfa9ce102802f9c714781b7a61d2f9c869b2cc /core | |
parent | 53f4351d9a70341bfa9083be3552b7f0d1f7ffbe (diff) | |
parent | 7ef028d8d49684247dfcb0ae276426684bf2d778 (diff) | |
download | prosody-70bbc77e68d75584b50be3c950ab4c5aed163374.tar.gz prosody-70bbc77e68d75584b50be3c950ab4c5aed163374.zip |
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions