aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-26 14:54:39 +0100
committerKim Alvefur <zash@zash.se>2016-03-26 14:54:39 +0100
commit4173551bfe86132de4392086b91988ee91c46cd0 (patch)
tree4ae873335fac8ab24744036958a1be02552a52bd /core
parent4ca8e2aaed9b4e58ee1a9b67bb8a6d9f99e51632 (diff)
parentc24be27b2f9a76001ff4c3de442606b05543ed7e (diff)
downloadprosody-4173551bfe86132de4392086b91988ee91c46cd0.tar.gz
prosody-4173551bfe86132de4392086b91988ee91c46cd0.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions