diff options
author | Kim Alvefur <zash@zash.se> | 2020-02-24 23:33:53 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2020-02-24 23:33:53 +0100 |
commit | f50d8689147238ae9cd383c1bd83cbc542f8e5b7 (patch) | |
tree | 9f4e055282a28c537f8075059da4d559d67eb580 /util/startup.lua | |
parent | 1c68c0e36cb05b880857246cd0fc851384ab6520 (diff) | |
parent | ca18226ee980d3a4c961e1a18d9fa132562bab93 (diff) | |
download | prosody-f50d8689147238ae9cd383c1bd83cbc542f8e5b7.tar.gz prosody-f50d8689147238ae9cd383c1bd83cbc542f8e5b7.zip |
Merge 0.11->trunk
Diffstat (limited to 'util/startup.lua')
0 files changed, 0 insertions, 0 deletions