projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b11d36 c4b175b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 19 Sep 2015 15:51:20 +0000 (17:51 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 19 Sep 2015 15:51:20 +0000 (17:51 +0200)
1  2 
plugins/mod_admin_telnet.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_admin_telnet.lua
Simple merge