Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Sleuthkit
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

675d4ed9

Commit 675d4ed9 authored 1 year ago by apriestman

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into 7279_linuxOsAccounts

parents fe139e03 e2a6c99d

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java 13 additions, 2 deletions

.../java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties 1 addition, 0 deletions

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED 5 additions, 0 deletions

...java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED

with 19 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment