aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-08 16:16:08 +0100
committerKim Alvefur <zash@zash.se>2016-01-08 16:16:08 +0100
commitebdebb946d9d2c501c0fe7d76d57798ab60e3ff9 (patch)
treefa735fdc4d7fd7f7b8f14ea5dc1e5a86a0ca5dde /core
parentb057664428d529b182ac9a69800402d2f517b43b (diff)
parent224a98b2c63864a480ca38056ea945f92e8122b8 (diff)
downloadprosody-ebdebb946d9d2c501c0fe7d76d57798ab60e3ff9.tar.gz
prosody-ebdebb946d9d2c501c0fe7d76d57798ab60e3ff9.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions