commit 048ed9f0bc8ff49dac236baa02ff1a296ddc7b68 Merge: 84e04337 0ff8d7cc Author: n8fr8 nathan@freitas.net Date: Thu Sep 13 13:15:25 2018 -0400

Merge branch 'master' of github.com:n8fr8/orbot

app/src/main/res/values-fa/poestrings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)