aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-02 23:06:27 +0200
committerKim Alvefur <zash@zash.se>2017-04-02 23:06:27 +0200
commiteb6122c3e9c7f34f089bf26f3950f0574b05db46 (patch)
tree358e773c362310c340614ec2915410dc3f490367 /doc
parentd6f2c308a4151199c34d3baeb910f40c64d55be8 (diff)
parent879f2148f684a9e234dc042e45e7fd49f376ac2d (diff)
downloadprosody-eb6122c3e9c7f34f089bf26f3950f0574b05db46.tar.gz
prosody-eb6122c3e9c7f34f089bf26f3950f0574b05db46.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions