Autor: intrigeri
Data:
Para: Tails localization discussion
Asunto: Re: [Tails-l10n] [pull](de) wiki translation download page
flapflap wrote (14 Apr 2014 13:00:48 GMT) :
> please merge branch nivatius-download
Unfortunately, this branch causes conflicts. Please merge the current
master branch into it, resolve conflicts as needed, and ping me again.
Thanks in advance :)