millmanorama 03c88d9739 Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
#	RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
2019-01-15 12:14:41 +01:00
..
2018-12-10 16:42:39 -05:00