sajolida:
> spriver:
>> Hi,
>> sorry that I missed to review your changes. I am all okay with them.
>> Thanks for doing the work!
>>
>> Please pull
>>
>> [snip]
>>
>>> Since the above points need to/should be addressed outside of this
>>> review process, I repeat my previous request:
>>
>>> Please review: https://gitlab.com/flapflap/tails branch
>>> review_de_startup_options commit 01ca0491 review
>>
>>> If it is ready for merge, please say so and edit the subject to
>>> (pull).
>
> Merged, thanks!
>
Hmm.. I'm wondering if that may have been too fast since Muri reported a
merge conflict from my branch with master. If I look a Muri's branch, I
see a manually resolved conflict that I don't see in sajolida's merge
commit in master (but I see there was a conflict)...
