> Please merge the upstream master branch in it, resolve conflicts
Done in here: 4da9999
> and fix Markdown formatting (heading levels) in the Nov. meeting
> report ($deity knows what this has to do in a l10n pull request, but
> well).
Should be fixed in 622eb2b.
> I suggest you use a dedicated branch for French translation, and don't
> mix unrelated (doc, collective process) work in it. I strongly believe
> this will avoid all the pain we had this time :)
