diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-03 15:53:00 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-03 15:53:00 +0200 |
commit | d00290510d93265adb1ca29f17a15a168349c441 (patch) | |
tree | 94c7296d03a9c7fb4893a8de8e0b3fdabd3875e2 /core/rostermanager.lua | |
parent | d5c31923e6b7d3884d3b7d16b8dae355511d9773 (diff) | |
parent | 5e6475392910df01592a526e564634fc19c1c887 (diff) | |
download | prosody-d00290510d93265adb1ca29f17a15a168349c441.tar.gz prosody-d00290510d93265adb1ca29f17a15a168349c441.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/rostermanager.lua')
0 files changed, 0 insertions, 0 deletions