]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514df9a 2d43c07)
Merge branch 'no-more-ejabberd-receivers'
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 26 Dec 2017 16:02:54 +0000 (19:02 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 26 Dec 2017 16:02:54 +0000 (19:02 +0300)
Conflicts:
rebar.config

1  2 
rebar.config patch | diff1 | diff2 | blob | history

diff --cc rebar.config
Simple merge
Unnamed repository; edit this file 'description' to name the repository.