• divyanshu's avatar
    Merge branch 'develop-2.x' into redesignOnboarding · c5bda436
    divyanshu authored
    # Conflicts:
    #	app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/presentation/AuthenticationNavigator.kt
    #	app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
    #	app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
    #	app/src/main/res/layout/fragment_authentication_log_in.xml
    #	app/src/main/res/layout/fragment_profile.xml
    #	app/src/main/res/menu/navigation.xml
    #	app/src/main/res/values-de/strings.xml
    #	app/src/main/res/values-es/strings.xml
    #	app/src/main/res/values-fr/strings.xml
    #	app/src/main/res/values-hi-rIN/strings.xml
    #	app/src/main/res/values-pt-rBR/strings.xml
    #	app/src/main/res/values-ru/strings.xml
    #	app/src/main/res/values/strings.xml
    #	build.gradle
    c5bda436
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...
ids.xml Loading commit data...
strings.xml Loading commit data...
styles.xml Loading commit data...