Skip to content
  • Ilya Gulya's avatar
    Merge remote-tracking branch 'trunk/develop' into feature/extend_markdown_support · 19efd6b7
    Ilya Gulya authored
    # Conflicts:
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/issue/info/IssueInfoPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/issue/notes/IssueNotesPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/mergerequest/info/MergeRequestInfoPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/mergerequest/notes/MergeRequestNotesPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/project/info/ProjectInfoPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/global/list/SystemNoteAdapterDelegate.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/global/list/TargetHeaderPublicAdapterDelegate.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/global/list/TargetNotesAdapter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/global/list/UserNoteAdapterDelegate.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/my/TargetsAdapter.kt
    #	build.gradle.kts
    19efd6b7