Commit Graph

4 Commits

Author SHA1 Message Date
Itay Mizeretz a20cb16b48 Merge branch 'develop' into feature/send-raw-log
# Conflicts:
#	infection_monkey/main.py
#	monkey_island/cc/app.py
#	monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
2018-02-27 19:32:28 +02:00
Itay Mizeretz d8946feb69 Fix CR 2018-02-27 19:13:28 +02:00
Itay Mizeretz 70766e7358 Save some space 2018-02-14 16:58:58 +02:00
Itay Mizeretz dbe7a6a378 Add log sending logic to monkey
Add log processing logic to monkey island backend
2018-02-14 15:50:53 +02:00