diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:19:44 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:19:44 +0000 |
commit | 25d886be280a1b6d9965b38cb22aa328354de0c2 (patch) | |
tree | 69f565f2bab115b3662d43441fde35e4d05a572f /plugins/adhoc | |
parent | eaf02c2e7fef247e6ff9c4eeb9fb3dfb1c28e5c1 (diff) | |
parent | 9e44974cd3e26de7abfe12fab2ee54b02b5da654 (diff) | |
download | prosody-25d886be280a1b6d9965b38cb22aa328354de0c2.tar.gz prosody-25d886be280a1b6d9965b38cb22aa328354de0c2.zip |
Merge with merge merge merge
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions