Hi mercedes,
anonym <anonym@???> :
> mercedes508:
> > Hi,
> >
> >> Fait, merci de relire elouann / web/test_1.7-rc1 / 1c7551e :
> >
> > Reviewed and fixed, to be merged from here:
> >
> > mercedes508 web/test_1.7-rc1 df78c894ae1
>
> There are some weird stuff in your branch, e.g.:
>
> 330bf4a adding untracked files
>
> So I merged elouann's 1c7551e but cherry-picked your df78c89 (so it
> became be3d4d5). You may want to have a look at your master, possibly
> resetting it (with --hard) to the state of origin's master.
`git branch -r --contains 330bf4a` gives :
mercedes508/doc/bug-reporting
mercedes508/master
mercedes508/translation
mercedes508/web/test_1.7-rc1
Cheers,
~ elouann
