projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4f6b84
1b01b4f
)
Merge 0.9->0.10
author
Matthew Wild
<mwild1@gmail.com>
Fri, 13 Dec 2013 12:52:39 +0000
(12:52 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 13 Dec 2013 12:52:39 +0000
(12:52 +0000)
1
2
plugins/muc/mod_muc.lua
patch
|
diff1
|
diff2
|
blob
|
history
prosody
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/muc/mod_muc.lua
Simple merge
diff --cc
prosody
Simple merge
projects / prosody.git / commitdiff