• 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
.circleci Loading commit data...
.github Loading commit data...
app Loading commit data...
config/quality Loading commit data...
draw Loading commit data...
emoji Loading commit data...
gradle/wrapper Loading commit data...
player Loading commit data...
wear Loading commit data...
.gitignore Loading commit data...
CODE_OF_CONDUCT.md Loading commit data...
CODING_STYLE.md Loading commit data...
HISTORY.md Loading commit data...
LICENSE Loading commit data...
PLANNING.md Loading commit data...
README.md Loading commit data...
SECURITY.md Loading commit data...
build.gradle Loading commit data...
debug.keystore Loading commit data...
dependencies.gradle Loading commit data...
gradle.properties Loading commit data...
gradlew Loading commit data...
gradlew.bat Loading commit data...
settings.gradle Loading commit data...