• 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
..
colors.xml Loading commit data...
defaults.xml Loading commit data...
dimens.xml Loading commit data...
fonts.xml Loading commit data...
strings.xml Loading commit data...
styles.xml Loading commit data...