• divyanshu's avatar
    Merge branch 'develop-2.x' into redesignOnboarding · d0822a47
    divyanshu authored
    # Conflicts:
    #	app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
    #	app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt
    #	app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
    #	app/src/main/res/layout/fragment_authentication_log_in.xml
    #	gradle/wrapper/gradle-wrapper.properties
    d0822a47
Name
Last commit
Last update
..
anim Loading commit data...
drawable Loading commit data...
drawable-anydpi-v21 Loading commit data...
layout Loading commit data...
menu Loading commit data...
mipmap-anydpi-v26 Loading commit data...
mipmap-hdpi Loading commit data...
mipmap-mdpi Loading commit data...
mipmap-xhdpi Loading commit data...
mipmap-xxhdpi Loading commit data...
mipmap-xxxhdpi Loading commit data...
values Loading commit data...
values-de Loading commit data...
values-es Loading commit data...
values-fr Loading commit data...
values-hi-rIN Loading commit data...
values-pt-rBR Loading commit data...
values-ru Loading commit data...
values-w820dp Loading commit data...
xml Loading commit data...