• Eugene Shapovalov's avatar
    Merge remote-tracking branch 'remotes/origin/develop' into feature/project_file_code_highlight · ddabe6c6
    Eugene Shapovalov authored
    # Conflicts:
    #	app/src/main/java/ru/terrakok/gitlabclient/Screens.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/mergerequest/changes/MergeRequestChangesPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/presentation/project/files/ProjectFilesPresenter.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/global/list/MergeRequestChangeAdapterDelegate.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/ui/mergerequest/MergeRequestChangesFragment.kt
    ddabe6c6
qualifier.kt 741 Bytes