]> granicus.if.org Git - ejabberd/commit
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 18 Nov 2016 10:39:10 +0000 (13:39 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 18 Nov 2016 10:39:10 +0000 (13:39 +0300)
commitf57f267c542a8e6ddbb31cb3ba05c4fd3798f998
tree4322c5f5b94f4d4f657aaa2199fc963cfc485bc8
parentb8dcc911a3b1e3cc05074d9ac4bd8da80b431388
parent995c97671d418264d35aa2308f642bf382832638
Merge branch 'master' of github.com:processone/ejabberd

Conflicts:
test/ejabberd_SUITE.erl
test/suite.erl