p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
monkey/monkey_island/cc
History
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
..
binaries directory placeholder 2016-07-20 01:08:35 +03:00
environment Fix CR 2018-02-25 18:23:52 +02:00
resources Merge branch 'develop' into feature/send-raw-log 2018-02-27 19:32:28 +02:00
services Merge branch 'develop' into feature/send-raw-log 2018-02-27 19:32:28 +02:00
ui Merge branch 'develop' into feature/send-raw-log 2018-02-27 19:32:28 +02:00
__init__.py organize cc server files 2017-08-25 17:47:08 +03:00
app.py Merge branch 'develop' into feature/send-raw-log 2018-02-27 19:32:28 +02:00
auth.py Fix CR 2018-02-25 18:23:52 +02:00
database.py Fix CR 2018-02-27 19:13:28 +02:00
main.py Merge remote-tracking branch 'origin/master' into develop 2018-02-25 19:15:09 +02:00
server_config.json Add server config file and use in frontend+backend 2018-02-22 20:33:40 +02:00
utils.py Fixed CR 2018-01-16 17:23:17 +02:00