• divyanshu's avatar
    Merge branch 'develop-2.x' into android-draw · 74031054
    divyanshu authored
    # Conflicts:
    #	app/build.gradle
    #	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
    #	app/src/main/res/values-hi-rIN/strings.xml
    #	settings.gradle
    74031054
Name
Last commit
Last update
..
gradle/wrapper 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...