]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Wed, 9 Nov 2016 08:04:58 +0000 (09:04 +0100)
committerMickael Remond <mremond@process-one.net>
Wed, 9 Nov 2016 08:04:58 +0000 (09:04 +0100)
1  2 
src/ejabberd_admin.erl

Simple merge