Skip to content
  • Social Justice Wizard's avatar
    Merge remote-tracking branch 'upstream/develop' · fdf4438b
    Social Justice Wizard authored
    # Conflicts:
    #	README.md
    #	app/build.gradle
    #	app/src/main/res/values-de/strings.xml
    #	app/src/main/res/values-fa/strings.xml
    #	app/src/main/res/values-fr/strings.xml
    #	app/src/main/res/values-hu/strings.xml
    #	app/src/main/res/values-pt-rBR/strings.xml
    #	app/src/main/res/values-zh-rCN/strings.xml
    #	app/src/main/res/values-zh-rTW/strings.xml
    #	fastlane/metadata/android/ca/changelogs/70.txt
    #	fastlane/metadata/android/it/changelogs/58.txt
    #	fastlane/metadata/android/ja/changelogs/74.txt
    #	fastlane/metadata/android/nl/changelogs/68.txt
    #	fastlane/metadata/android/tr/changelogs/61.txt
    #	fastlane/metadata/android/tr/changelogs/67.txt
    #	fastlane/metadata/android/tr/changelogs/68.txt
    #	fastlane/metadata/android/tr/full_description.txt
    #	fastlane/metadata/android/tr/short_description.txt
    fdf4438b