Skip to content
  • Eugene Shapovalov's avatar
    Merge remote-tracking branch 'remotes/origin/develop' into feature/issue_merge_request_info · 418e4d94
    Eugene Shapovalov authored
    # Conflicts:
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/Note.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/app/target/TargetHeader.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/event/Event.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/issue/Issue.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/mergerequest/MergeRequest.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/target/Target.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/entity/todo/Todo.kt
    #	app/src/main/java/ru/terrakok/gitlabclient/model/data/server/deserializer/TodoDeserializer.kt
    418e4d94