diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-05 23:03:09 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-05 23:03:09 +0100 |
commit | 4688968fe15623c69158d4ceef63d83e3ef2ddb2 (patch) | |
tree | 4c6789585cf1e7ca711eb7c4253a5da0ef37a9b8 /core/rostermanager.lua | |
parent | 0031f4db2cd964b2f0bec5c6292a30107ee68c60 (diff) | |
parent | 7b00ac62089347c7c20f744ba115ab7ee683be88 (diff) | |
download | prosody-4688968fe15623c69158d4ceef63d83e3ef2ddb2.tar.gz prosody-4688968fe15623c69158d4ceef63d83e3ef2ddb2.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
0 files changed, 0 insertions, 0 deletions