Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.

Merge/defect dojo#60

Merged
J12934 merged 54 commits intodevelopfrom
merge/defect-dojo
Jan 23, 2019
Merged

Merge/defect dojo#60
J12934 merged 54 commits intodevelopfrom
merge/defect-dojo

Conversation

@J12934
Copy link
Member

@J12934 J12934 commented Jan 23, 2019

No description provided.

J12934 and others added 30 commits December 5, 2018 13:23
Currently only creating engagements for every securityTetst
… into feature/defect-dojo-integration

# Conflicts:
#	scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java
Now supporting potentially all imports which are currently in defectdojo
MartinLang1 and others added 24 commits January 9, 2019 15:44
(cherry picked from commit a97e067)
…rt' into merge/defect-dojo

# Conflicts:
#	scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java
#	scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java
@J12934 J12934 merged commit 8dce763 into develop Jan 23, 2019
@J12934 J12934 deleted the merge/defect-dojo branch February 13, 2019 15:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants