diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-24 13:57:58 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-24 13:57:58 +0100 |
commit | 1c4e23ccddeffdc45eb6de28460205f5da7fab82 (patch) | |
tree | d6ebdfc4aefc67d749aa7322ce910b83c4119f47 /plugins/mod_uptime.lua | |
parent | 6ba752537d94d555b84862d99fe57d883d94f724 (diff) | |
parent | 921c69533820f54eea04a84f043eddb156482f92 (diff) | |
download | prosody-1c4e23ccddeffdc45eb6de28460205f5da7fab82.tar.gz prosody-1c4e23ccddeffdc45eb6de28460205f5da7fab82.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_uptime.lua')
0 files changed, 0 insertions, 0 deletions