diff options
author | Kim Alvefur <zash@zash.se> | 2016-07-23 18:58:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-07-23 18:58:58 +0200 |
commit | 6b59d7d9da7d8ebe92a5f2bf93a76ac98b057241 (patch) | |
tree | 5b3d9eec6726161611eafac7f8efdaa3b87d4dff /core/rostermanager.lua | |
parent | 96713c8ff024e30feb1ef77b86542600e8873229 (diff) | |
parent | 2c6065e198926e5026d51a2b0effe9223dd2cd01 (diff) | |
download | prosody-6b59d7d9da7d8ebe92a5f2bf93a76ac98b057241.tar.gz prosody-6b59d7d9da7d8ebe92a5f2bf93a76ac98b057241.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
0 files changed, 0 insertions, 0 deletions