Marino Faggiana f182d770fb Conflicts resolved 6 years ago
..
BKPasscodeView.strings 9926f4ba79 [tx-robot] updated from transifex 6 years ago
Error.strings 1b3e8994a3 Add Lang 7 years ago
InfoPlist.strings 9926f4ba79 [tx-robot] updated from transifex 6 years ago
Intro.strings 1b3e8994a3 Add Lang 7 years ago
Localizable.strings ac9ea29aef [tx-robot] updated from transifex 6 years ago