diff options
| author | Kim Alvefur <zash@zash.se> | 2015-12-13 21:22:26 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-12-13 21:22:26 +0100 |
| commit | e511eba924fcc3bc898cb0fd336db1f94c22b29e (patch) | |
| tree | 737ceedf966fe08ddf731d4fb5dadcba1c6b427d /doc | |
| parent | 9f3f9241db8a09a45a418ca6569adf6935898dbd (diff) | |
| parent | 14cc4c9287df4e7c48128b9e53f0f48d2fab75d0 (diff) | |
| download | prosody-e511eba924fcc3bc898cb0fd336db1f94c22b29e.tar.gz prosody-e511eba924fcc3bc898cb0fd336db1f94c22b29e.zip | |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions