Comparison

HACKERS @ 10061:5c71693c8345

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 08 Jul 2019 02:44:32 +0200
parent 9858:54147de1d1b1
comparison
equal deleted inserted replaced
10060:7a36b7ac309b 10061:5c71693c8345
3 This project accepts and *encourages* contributions. If you would like to get 3 This project accepts and *encourages* contributions. If you would like to get
4 involved you can join us on our mailing list and discussion rooms. More 4 involved you can join us on our mailing list and discussion rooms. More
5 information on these at https://prosody.im/discuss 5 information on these at https://prosody.im/discuss
6 6
7 Patches are welcome, though before sending we would appreciate if you read 7 Patches are welcome, though before sending we would appreciate if you read
8 docs/coding_style.txt for guidelines on how to format your code, and other tips. 8 docs/coding_style.md for guidelines on how to format your code, and other tips.
9 9
10 Documentation for developers can be found at https://prosody.im/doc/developers 10 Documentation for developers can be found at https://prosody.im/doc/developers
11 11
12 Have fun :) 12 Have fun :)