aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-08 15:12:44 +0200
committerKim Alvefur <zash@zash.se>2016-07-08 15:12:44 +0200
commit8c0ca748b53ca43d707d86590f666bda5e908a81 (patch)
tree6af93350c7e5736376dcee4101e54b940539a50e /Makefile
parent02640bdb566f49709c408de4d8a10b42279a6431 (diff)
parentddccdcd00d24514e5a9bafad9d5789f674bd8770 (diff)
downloadprosody-8c0ca748b53ca43d707d86590f666bda5e908a81.tar.gz
prosody-8c0ca748b53ca43d707d86590f666bda5e908a81.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions