X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=help%2Fes%2Fmerge.page;h=61b1d499afdbfaad356fd505f6a2f0ee71ed20c4;hb=refs%2Ftags%2Fupstream%2F3.4.0;hp=75f79bd8487bb4a7add4979a3db02b51513fb902;hpb=8e4c50283c4f353b18c68474f91209b8bd050557;p=glabels diff --git a/help/es/merge.page b/help/es/merge.page index 75f79bd8..61b1d499 100644 --- a/help/es/merge.page +++ b/help/es/merge.page @@ -20,7 +20,7 @@ Daniel Mustieles daniel.mustieles@gmail.com - 2010-2012 + 2010-2016