]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Mon, 21 Mar 2016 08:43:14 +0000 (09:43 +0100)
committerMickael Remond <mremond@process-one.net>
Mon, 21 Mar 2016 08:43:14 +0000 (09:43 +0100)
commit5b7dc0c215143fb800333e5ef19fb6446639ef46
tree6b266a76dc218f8fbd41f3566691ce1ff9588ceb
parent0e3026539ea072c54fb2ade9b08d0e65247c3ac3
parentdc7b2c45c22dca33a25002e7e85168621e4346ea
Merge branch 'master' of github.com:processone/ejabberd