mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-19 11:07:43 +00:00
Merge remote-tracking branch 'upstream/develop' into multiple_follow_up_fixes
Conflicts: CoreLibs/nbproject/project.properties
This commit is contained in:
commit
835347f092
@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
|
|
||||||
<ivy-module version="2.0">
|
<ivy-module version="2.0">
|
||||||
<info organisation="org.sleuthkit.autopsy" module="corelibs"/>
|
<info organisation="org.sleuthkit.autopsy" module="corelibs"/>
|
||||||
<configurations >
|
<configurations >
|
||||||
|
Loading…
x
Reference in New Issue
Block a user