diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-19 16:33:47 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-19 16:33:47 +0200 |
commit | 98d695f3a199cdf07d26f9c0ae7d23a56da157a1 (patch) | |
tree | 14a722959d1179338adec58efd9e5d7fcfa58ada /core/rostermanager.lua | |
parent | 879862c536a5fba488307eb9e8a2f4f6523dbf09 (diff) | |
parent | 9ef666506252bd82ae729d0a69235f4c9ea818f2 (diff) | |
download | prosody-98d695f3a199cdf07d26f9c0ae7d23a56da157a1.tar.gz prosody-98d695f3a199cdf07d26f9c0ae7d23a56da157a1.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
0 files changed, 0 insertions, 0 deletions