• 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
..
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...