diff options
author | Kim Alvefur <zash@zash.se> | 2022-06-14 19:21:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2022-06-14 19:21:20 +0200 |
commit | 529d711bf1ab3844aa1f4485206b97b669a4a985 (patch) | |
tree | 6798c9c41c1de28988c72af33b3927e1e4efd03f /prosody | |
parent | 07660a908817500a6f17dd2fad8cc38f373d82f1 (diff) | |
parent | d5e749bc8a1a6b003ba858310145745dcad5ec9c (diff) | |
download | prosody-529d711bf1ab3844aa1f4485206b97b669a4a985.tar.gz prosody-529d711bf1ab3844aa1f4485206b97b669a4a985.zip |
Merge 0.12->trunk
Diffstat (limited to 'prosody')
-rwxr-xr-x | prosody | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -82,4 +82,4 @@ end loop(); -thread:run(startup.shutdown); +startup.exit(); |