Skip to content
  • Jose Blaya's avatar
    Merge branch 'release/1.1.8' into release/2.0.0 · ba2efd35
    Jose Blaya authored
    # Conflicts:
    #	PIALibrary/Resources/UI/iOS/ar.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/da.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/de.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/es-MX.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/fr.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/it.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/ja.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/ko.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/nb.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/nl.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/pl.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/pt-BR.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/ru.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/th.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/tr.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/zh-Hans.lproj/Welcome.strings
    #	PIALibrary/Resources/UI/iOS/zh-Hant.lproj/Welcome.strings
    ba2efd35