aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-09-12 22:31:25 +0100
committerMatthew Wild <mwild1@gmail.com>2016-09-12 22:31:25 +0100
commitf4690a6063ec7940ef304691906fdfdebb57eab6 (patch)
tree1b740492720e5c386b928514e711e90e705f5693 /CHANGES
parent0e971a43895405f996ea49fc70142ec9ba182cc1 (diff)
parentcd10e4439e1c9b6209f87bb6c77e51fb2f7992fc (diff)
downloadprosody-f4690a6063ec7940ef304691906fdfdebb57eab6.tar.gz
prosody-f4690a6063ec7940ef304691906fdfdebb57eab6.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions