Merge remote-tracking branch 'origin/run_page_ui_improvements' into run_page_ui_improvements

Browse Source

# Conflicts:
#	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/CommandDisplay.js
#	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/LocalManualRunOptions.js
#	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/ManualRunOptions.js
#	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/BackButton.js
#	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/InlineSelection.js
#	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/NextSelectionButton.js
#	monkey/monkey_island/cc/ui/src/styles/Main.scss
#	monkey/monkey_island/cc/ui/src/styles/components/inline-selection/InlineSelection.scss

...

This commit is contained in:

VakarisZ 2020-09-18 15:38:57 +03:00

parent 38b1cfacaa 0d047b28e3

commit ac9c04e453

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available