projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3447e08
77a413b
)
Merge
author
Matthew Wild
<mwild1@gmail.com>
Mon, 27 Jul 2015 08:38:40 +0000
(09:38 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Mon, 27 Jul 2015 08:38:40 +0000
(09:38 +0100)
1
2
plugins/muc/mod_muc.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/muc/mod_muc.lua
Simple merge