Tags: webvul/scot
Tags
Merge branch 'Internal-master' Conflicts: bin/metric.pl bin/restore.pl demo/demo.sh demo/demo2.pl install/determine_os.sh install/install_perl.sh lib/Scot.pm lib/Scot/App/Flair.pm lib/Scot/App/Game.pm lib/Scot/Collection.pm lib/Scot/Collection/Alertgroup.pm lib/Scot/Collection/Apikey.pm lib/Scot/Collection/Atmetric.pm lib/Scot/Collection/Checklist.pm lib/Scot/Collection/Entity.pm lib/Scot/Collection/Entry.pm lib/Scot/Collection/Event.pm lib/Scot/Collection/File.pm lib/Scot/Collection/Guide.pm lib/Scot/Collection/Handler.pm lib/Scot/Collection/Incident.pm lib/Scot/Collection/Intel.pm lib/Scot/Collection/Link.pm lib/Scot/Collection/Signature.pm lib/Scot/Collection/Tag.pm lib/Scot/Collection/User.pm lib/Scot/Controller/Api.pm lib/Scot/Controller/Auth.pm lib/Scot/Controller/Metric.pm lib/Scot/Model/Alertgroup.pm lib/Scot/Model/Signature.pm lib/Scot/Parser/Splunk.pm lib/Scot/Role/TLP.pm pubdev/gulpfile.js pubdev/jsdev/react_components/components/add_entry.jsx pubdev/jsdev/react_components/components/detail_data_status.jsx pubdev/jsdev/react_components/components/file_upload.jsx pubdev/jsdev/react_components/components/signature_table.jsx pubdev/jsdev/react_components/detail/selected_entry.jsx pubdev/jsdev/react_components/detail/selected_header.jsx pubdev/jsdev/react_components/detail/selected_header_options.jsx pubdev/jsdev/react_components/list/list-view.jsx pubdev/jsdev/react_components/main/index.jsx pubdev/jsdev/react_components/modal/entity_detail.jsx pubdev/jsdev/react_components/modal/link_warning.jsx pubdev/node_modules/prop-types/node_modules/fbjs/CHANGELOG.md pubdev/node_modules/prop-types/node_modules/fbjs/lib/Deferred.js pubdev/node_modules/prop-types/node_modules/fbjs/lib/Deferred.js.flow pubdev/node_modules/prop-types/node_modules/fbjs/lib/EventListener.js pubdev/node_modules/prop-types/node_modules/fbjs/lib/EventListener.js.flow pubdev/node_modules/prop-types/node_modules/fbjs/lib/warning.js pubdev/node_modules/prop-types/node_modules/fbjs/package.json pubdev/node_modules/prop-types/package.json pubdev/package.json pubdev/sass/components/esearch.scss public/css/listview.css public/css/sandbox.css public/css/styles.css public/css/styles.less public/index.html public/js/list-columns.js public/revl.html public/scot-3.5.js t/api/alertgroup.t t/api/entry.t t/api/event.t t/api/link.t t/api/promote.t t/entityextractor/email.t