]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63777f8 b244bce)
Merge remote-tracking branch 'processone/pr/907'
authorHolger Weiss <holger@zedat.fu-berlin.de>
Sat, 16 Jan 2016 23:08:30 +0000 (00:08 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Sat, 16 Jan 2016 23:08:30 +0000 (00:08 +0100)
* processone/pr/907:
  don't escape ERL_OPTIONS

1  2 
ejabberdctl.template patch | diff1 | diff2 | blob | history

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