Merge 0.11->trunk

author: Kim Alvefur <zash@zash.se>
date: Mon, 08 Jul 2019 02:44:32 +0200
parent: 9946:ceaca48a7e6d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CONTRIBUTING	Mon Jul 08 02:44:32 2019 +0200
@@ -0,0 +1,9 @@
+Thanks for your interest in contributing to the project!
+
+There are many ways to contribute, such as helping improve the
+documentation, reporting bugs, spreading the word or testing the latest
+development version.
+
+You can find more information on how to contribute at <https://prosody.im/doc/contributing>
+
+See also the HACKERS and README files.