[tor-commits] [torbutton/master] Merge remote-tracking branch 'arthur/28082'

[gk at torproject.org]

commit 38cc505106a37e704ce11a41d22b74cfde36449f
Merge: 9e5c4406 c94a5589
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Oct 18 09:17:17 2018 +0000

    Merge remote-tracking branch 'arthur/28082'

 trans_tools/import-translations.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)