aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_carbons.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-02 11:13:05 +0100
committerKim Alvefur <zash@zash.se>2016-12-02 11:13:05 +0100
commit5edecf159e4a7da6a5b8edccc9766a8119f8b69c (patch)
treeb8d5008111c5708e9ee236f6139e5100ccd683d2 /plugins/mod_carbons.lua
parent8cc205862760e879aa21ae934d62143e7f618b8a (diff)
parentb505c4dd28533f117a2085a020426111411e6d88 (diff)
downloadprosody-5edecf159e4a7da6a5b8edccc9766a8119f8b69c.tar.gz
prosody-5edecf159e4a7da6a5b8edccc9766a8119f8b69c.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_carbons.lua')
0 files changed, 0 insertions, 0 deletions