]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38ec3f6 56dc625)
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 1 Jul 2018 22:08:09 +0000 (01:08 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 1 Jul 2018 22:08:09 +0000 (01:08 +0300)
1  2 
ejabberd.yml.example patch | diff1 | diff2 | blob | history

diff --cc ejabberd.yml.example
Simple merge
Unnamed repository; edit this file 'description' to name the repository.