aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_carbons.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-25 22:37:41 +0100
committerKim Alvefur <zash@zash.se>2016-02-25 22:37:41 +0100
commit43f78544112ebbb4a63bafdf4243225ed4b53cfb (patch)
treec296ef2b89bd5fac3f1ee1eae5a627c921b375ce /plugins/mod_carbons.lua
parent1452ca3d5fe5fcc8fa7f5229c7122de979c5d8b7 (diff)
parent1370ab3c3a9a130e763149446ac4af6160a6cfc1 (diff)
downloadprosody-43f78544112ebbb4a63bafdf4243225ed4b53cfb.tar.gz
prosody-43f78544112ebbb4a63bafdf4243225ed4b53cfb.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_carbons.lua')
0 files changed, 0 insertions, 0 deletions