• Social Justice Wizard's avatar
    Merge remote-tracking branch 'upstream/develop' · 32f558f3
    Social Justice Wizard authored
    # Conflicts:
    #	app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
    #	app/src/main/java/com/keylesspalace/tusky/ScheduledTootActivity.kt
    #	app/src/main/res/mipmap-anydpi-v26/ic_shortcut_compose.xml
    #	app/src/main/res/values-ca/strings.xml
    #	app/src/main/res/values-fr/strings.xml
    #	app/src/main/res/values-sv/strings.xml
    #	app/src/main/res/values-tr/strings.xml
    #	app/src/main/res/values/donottranslate.xml
    #	app/src/main/res/values/strings.xml
    #	fastlane/metadata/android/ca/changelogs/58.txt
    #	fastlane/metadata/android/fr/changelogs/67.txt
    #	fastlane/metadata/android/sv/short_description.txt
    32f558f3
Name
Last commit
Last update
app Loading commit data...
assets Loading commit data...
fastlane/metadata/android/en-US Loading commit data...
gradle/wrapper Loading commit data...
.gitignore Loading commit data...
.gitlab-ci.yml Loading commit data...
ISSUE_TEMPLATE.md Loading commit data...
LICENSE.txt Loading commit data...
README.md Loading commit data...
build.gradle Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
instance-build.gradle Loading commit data...
settings.gradle Loading commit data...