• 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
..
adapter Loading commit data...
di Loading commit data...
domain Loading commit data...
presentation Loading commit data...
service Loading commit data...
ui Loading commit data...
uimodel Loading commit data...