• divyanshu's avatar
    Merge branch 'develop-2.x' into visible-ktx · f51df907
    divyanshu authored
    # Conflicts:
    #	app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
    #	app/src/main/java/chat/rocket/android/util/extensions/Animation.kt
    #	app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
    f51df907
Name
Last commit
Last update
..
gradle/wrapper Loading commit data...
schemas/chat.rocket.android.db.RCDatabase Loading commit data...
src Loading commit data...
.gitignore Loading commit data...
build-sdk.sh Loading commit data...
build.gradle Loading commit data...
google-services.json Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
proguard-rules.pro Loading commit data...
sender-id.txt Loading commit data...