aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-13 22:38:31 +0200
committerKim Alvefur <zash@zash.se>2017-04-13 22:38:31 +0200
commit5605d1094b7bf2784f7b7f4c917d91aacf08139a (patch)
tree706e69e60a8560b8fd6634db84455a21c728c0f9 /CHANGES
parent9548228ec81cc66c0b58fa4b563029ea8cadb386 (diff)
parent656c5d45a1bfd3d53a2e3b675fbd95c870b170aa (diff)
downloadprosody-5605d1094b7bf2784f7b7f4c917d91aacf08139a.tar.gz
prosody-5605d1094b7bf2784f7b7f4c917d91aacf08139a.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions