projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f366b23 987e2bf)
Merge with Link Mauve
authorKim Alvefur <zash@zash.se>
Sun, 17 Apr 2016 20:28:48 +0000 (22:28 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 17 Apr 2016 20:28:48 +0000 (22:28 +0200)
1  2 
plugins/muc/mod_muc.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/muc/mod_muc.lua
Simple merge