3 Commits

Author	SHA1	Message	Date
Daniel Goldberg	3e859d84fb	Rename check for 64-bit to make explict it's a windows only check	2018-04-12 17:57:21 +03:00
Itay Mizeretz	1407ab3969	Fix last CR comments	2018-04-11 21:09:06 +03: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