diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-13 20:14:06 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-13 20:14:06 +0200 |
| commit | a8ab13b47364b6458b93cbf16ef579e183289d5a (patch) | |
| tree | 98d1b668d63a65c58e169d1f7d3912050ef66de1 /prosody | |
| parent | 655752da9bed120b7419d575dbae0ed04916c4a3 (diff) | |
| parent | 14f5606da9c3d220ecea41c0ed6563fe4b287677 (diff) | |
| download | prosody-a8ab13b47364b6458b93cbf16ef579e183289d5a.tar.gz prosody-a8ab13b47364b6458b93cbf16ef579e183289d5a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions