]> granicus.if.org Git - ejabberd/commit
Make sure mix does not trigger conflict on p1_utils
authorMickael Remond <mremond@process-one.net>
Sat, 23 Jan 2016 16:36:40 +0000 (17:36 +0100)
committerMickael Remond <mremond@process-one.net>
Sat, 23 Jan 2016 16:36:40 +0000 (17:36 +0100)
commitdae1ec2b7b3f587e73edbfaaeff82dbc7ac0cb2d
tree4261914641cd742cf38654d4338b47d48739137a
parentf933cae2d6484cf5d694b1ed7a53fbd0bacbe6a6
Make sure mix does not trigger conflict on p1_utils
mix.exs