aboutsummaryrefslogtreecommitdiffstats
path: root/util/mercurial.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-14 18:57:30 +0200
committerKim Alvefur <zash@zash.se>2016-07-14 18:57:30 +0200
commita032f228b6a74aa0939de7085c49c1ee163e5a14 (patch)
treedb878418799bb639d79cb88a2f39bba428fc9e32 /util/mercurial.lua
parent7a96aa1a3cd45cbba3efb233174aeef5f1152324 (diff)
downloadprosody-a032f228b6a74aa0939de7085c49c1ee163e5a14.tar.gz
prosody-a032f228b6a74aa0939de7085c49c1ee163e5a14.zip
mod_bosh: Fix merge mistakes from c8923f882274
Diffstat (limited to 'util/mercurial.lua')
0 files changed, 0 insertions, 0 deletions