aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-20 19:12:19 +0200
committerKim Alvefur <zash@zash.se>2016-08-20 19:12:19 +0200
commitc48abbdf6245816fa55ff0f3e5e86367817eda7e (patch)
treee2df670ebfac5cde1c4306595b171dcb8e90d37e /core
parent8295fbe9dd1f303b78eea697d8c60b64d39e2788 (diff)
parent3045c13d18850533efc631b474e3c8aa7bc3aea5 (diff)
downloadprosody-c48abbdf6245816fa55ff0f3e5e86367817eda7e.tar.gz
prosody-c48abbdf6245816fa55ff0f3e5e86367817eda7e.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions