• divyanshu's avatar
    Merge branch 'develop-2.x' into visible-ktx · f51df907
    divyanshu authored
    # Conflicts:
    #	app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt
    #	app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
    #	app/src/main/java/chat/rocket/android/util/extensions/Animation.kt
    #	app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
    f51df907
Name
Last commit
Last update
..
ActionsAttachmentViewHolder.kt Loading commit data...
ActionsListAdapter.kt Loading commit data...
AudioAttachmentViewHolder.kt Loading commit data...
AuthorAttachmentViewHolder.kt Loading commit data...
AutoCompleteType.kt Loading commit data...
BaseViewHolder.kt Loading commit data...
ChatRoomAdapter.kt Loading commit data...
ColorAttachmentViewHolder.kt Loading commit data...
CommandSuggestionsAdapter.kt Loading commit data...
EmojiSuggestionsAdapter.kt Loading commit data...
GenericFileAttachmentViewHolder.kt Loading commit data...
ImageAttachmentViewHolder.kt Loading commit data...
MessageAttachmentViewHolder.kt Loading commit data...
MessageReactionsAdapter.kt Loading commit data...
MessageReplyViewHolder.kt Loading commit data...
MessageViewHolder.kt Loading commit data...
PeopleSuggestionsAdapter.kt Loading commit data...
RoomSuggestionsAdapter.kt Loading commit data...
UrlPreviewViewHolder.kt Loading commit data...
VideoAttachmentViewHolder.kt Loading commit data...