]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d2ef85 b550f24)
Merge branch 'master' of github.com:processone/ejabberd
authorJerome Sautret <jerome.sautret@process-one.net>
Thu, 30 Oct 2014 16:19:37 +0000 (17:19 +0100)
committerJerome Sautret <jerome.sautret@process-one.net>
Thu, 30 Oct 2014 16:19:37 +0000 (17:19 +0100)
1  2 
Makefile.in patch | diff1 | diff2 | blob | history

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