diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-28 18:47:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-28 18:47:32 +0100 |
commit | 9c95a61161f878e4a6487c13ea33854a58bad4a0 (patch) | |
tree | 45b3d17492ea86ca80f2643bc2d7ac275451deb8 /plugins/mod_uptime.lua | |
parent | f91689b1464dd53569c64a4cd1215807aa624c87 (diff) | |
parent | b4134596f5f6572604aeef890229acab458f693c (diff) | |
download | prosody-9c95a61161f878e4a6487c13ea33854a58bad4a0.tar.gz prosody-9c95a61161f878e4a6487c13ea33854a58bad4a0.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_uptime.lua')
0 files changed, 0 insertions, 0 deletions