]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8dcc91 995c976)
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)
Conflicts:
test/ejabberd_SUITE.erl

1  2 
test/suite.erl patch | diff1 | diff2 | blob | history

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