]> granicus.if.org Git - ejabberd/commit
Fix merge issues
authorMickael Remond <mremond@process-one.net>
Fri, 1 Apr 2016 10:12:19 +0000 (12:12 +0200)
committerMickael Remond <mremond@process-one.net>
Fri, 1 Apr 2016 10:12:19 +0000 (12:12 +0200)
commit2a2a47b5c6678a7edc97d02dea62174a9966c9dd
tree6f8bd5d62440289d13e52ae6e2d191c240cba894
parentb5f1479763c5df2bd327dbc9e349b0c2637df9cc
Fix merge issues
Makefile.in
include/ejabberd_commands.hrl