Re: [Tails-l10n] [Merge](de) Tails 0.22.1 announce and secur…

Delete this message

Reply to this message
Author: intrigeri
Date:  
To: Tails localization discussion
Subject: Re: [Tails-l10n] [Merge](de) Tails 0.22.1 announce and security advisory
Frithjof wrote (10 Feb 2014 20:18:42 GMT) :
> [master 538167a] Merge branch 'master' of https://git-tails.immerda.ch/tails.
> also resolves a merge conflict, that I should have resolved earlier.


This was part of what I've merged and pushed :)

Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc