]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42bede7 8618af4)
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Thu, 1 Dec 2016 14:05:09 +0000 (15:05 +0100)
committerMickael Remond <mremond@process-one.net>
Thu, 1 Dec 2016 14:05:09 +0000 (15:05 +0100)
1  2 
src/ejabberd_admin.erl patch | diff1 | diff2 | blob | history

diff --cc src/ejabberd_admin.erl
Simple merge
Unnamed repository; edit this file 'description' to name the repository.