Merge 0.11->trunk

author: Kim Alvefur <zash@zash.se>
date: Tue, 24 Dec 2019 00:39:45 +0100
parent: 9858:54147de1d1b1
--- a/HACKERS	Tue Dec 24 00:26:40 2019 +0100
+++ b/HACKERS	Tue Dec 24 00:39:45 2019 +0100
@@ -5,7 +5,7 @@
 information on these at https://prosody.im/discuss
 
 Patches are welcome, though before sending we would appreciate if you read 
-docs/coding_style.txt for guidelines on how to format your code, and other tips.
+docs/coding_style.md for guidelines on how to format your code, and other tips.
 
 Documentation for developers can be found at https://prosody.im/doc/developers