Reset --hard instead of merging, just in case TTP rewrite their history some day.
commit9043130bf0335d3cb261263f9c4d5d447afd092d
authorTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 15:00:03 +0000 (30 15:00 +0000)
committerTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 15:00:03 +0000 (30 15:00 +0000)
treea23eaeff80482617556e27bf6a84400a56fffec6
parent11d3760580f1b250e4d7f8c4acad665fcd34dc62
Reset --hard instead of merging, just in case TTP rewrite their history some day.
import-translations