Commit c21895fd authored by Ashkan's avatar Ashkan

Merge remote-tracking branch 'origin/feature/hecClasses' into feature/hecClasses

# Conflicts:
#	prrt/hec_search.py
parents 99c692fe 078cbeeb
Pipeline #4314 failed with stages
in 1 second
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment