aboutsummaryrefslogtreecommitdiffstats
path: root/makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-04-10 20:23:54 +0200
committerKim Alvefur <zash@zash.se>2018-04-10 20:23:54 +0200
commitd38609fc4807ef55fe43bdc15b2e7bab8ecdf905 (patch)
tree56ce87b57c881f7a5096b5f8c24b3cc4cc34fcdc /makefile
parentd1ded0b062305d31ae81bc2508f79e9af0a46734 (diff)
parent5b56cf55da53ec450d7ff35300271144fc0e836f (diff)
downloadprosody-d38609fc4807ef55fe43bdc15b2e7bab8ecdf905.tar.gz
prosody-d38609fc4807ef55fe43bdc15b2e7bab8ecdf905.zip
Merge 0.10->trunk
Diffstat (limited to 'makefile')
0 files changed, 0 insertions, 0 deletions