aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-19 17:51:20 +0200
committerKim Alvefur <zash@zash.se>2015-09-19 17:51:20 +0200
commit9b97c52790a17ea25e0e7ab96fe62280e4dbfea8 (patch)
tree47cf9d27ab4a9fef0167cf77f3674b183d9837fc /Makefile
parent26c4421db4127e1b62fbe90f027803bfc855f387 (diff)
parentf2c69ab1c34060bafbf172915bc8c160bb086af2 (diff)
downloadprosody-9b97c52790a17ea25e0e7ab96fe62280e4dbfea8.tar.gz
prosody-9b97c52790a17ea25e0e7ab96fe62280e4dbfea8.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions