]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2956812 5b0d8b7)
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Thu, 30 Oct 2014 16:44:04 +0000 (17:44 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Thu, 30 Oct 2014 16:44:04 +0000 (17:44 +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.