• 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
..
anim Loading commit data...
drawable Loading commit data...
drawable-anydpi-v21 Loading commit data...
layout Loading commit data...
menu Loading commit data...
mipmap-anydpi-v26 Loading commit data...
mipmap-hdpi Loading commit data...
mipmap-mdpi Loading commit data...
mipmap-xhdpi Loading commit data...
mipmap-xxhdpi Loading commit data...
mipmap-xxxhdpi Loading commit data...
values Loading commit data...
values-es Loading commit data...
values-fr Loading commit data...
values-hi-rIN Loading commit data...
values-pt-rBR Loading commit data...
values-uk-rRU Loading commit data...
values-w820dp Loading commit data...
xml Loading commit data...