Marino Faggiana 4cb842d642 Merge branch 'develop' 7 gadi atpakaļ
..
BKPasscodeView.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ
CTAssetsPicker.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ
Error.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ
InfoPlist.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ
Intro.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ
Localizable.strings 4cb842d642 Merge branch 'develop' 7 gadi atpakaļ
SwiftWebVC.strings 47274239a9 Conflicts resolved 7 gadi atpakaļ