Daniel Goldberg
|
8f5643b0b5
|
Merge pull request #87 from guardicore/feature/send-raw-log
Feature/send raw log
|
2018-03-06 18:10:22 +02:00 |
Itay Mizeretz
|
03c32025aa
|
Update icons
|
2018-02-27 19:39:32 +02:00 |
|
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
|
a69f7d93a3
|
Merge remote-tracking branch 'origin/develop' into bugfix/rename_Cnc_island
|
2018-02-22 10:57:08 +02:00 |
|
Itay Mizeretz
|
de4e4b9ea1
|
rename chaos_monkey folder to infection_monkey
|
2018-02-19 11:35:34 +02:00 |