]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1176e1f fedfe54)
Merge branch 'new_stream' of github.com:processone/ejabberd into new_stream
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 16 Jan 2017 15:15:08 +0000 (18:15 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 16 Jan 2017 15:15:08 +0000 (18:15 +0300)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.