diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-11 17:51:02 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-11 17:51:02 +0100 |
| commit | 37da3cc72a7be5bc414ec7600860ec8e841ef1a0 (patch) | |
| tree | 044f48fc94197d0151e1e1282d62aa726f747774 /core | |
| parent | 08c9156f20fe9700913f5b97e6199b396ed6a87f (diff) | |
| parent | bde567fd42b357fb11ffdbf0e8d2821b1538b213 (diff) | |
| download | prosody-37da3cc72a7be5bc414ec7600860ec8e841ef1a0.tar.gz prosody-37da3cc72a7be5bc414ec7600860ec8e841ef1a0.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions