]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 11:57:12 +0000 (13:57 +0200)
committerMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 11:57:12 +0000 (13:57 +0200)
commitb2279d481d9d4326549c1ad67dfcff5f8dbb1efd
tree2bfcee2174400993883c7ccf567f7c07aa0d9372
parent267fdb2e9553d3154f1f86d0db8af05487c2474a
parentd9f1061b8a98666f71fb3d10f42a18f403e4e7b6
Merge branch 'master' of github.com:processone/ejabberd