Merge remote-tracking branch 'upstream/master'

2018-03-16 12:13:37 +01:00 · 2018-03-16 12:13:37 +01:00 · f6a003522b
parent 30c0700119 a7763a0986
commit f6a003522b
3 changed files with 5 additions and 3 deletions
--- a/4
+++ b/4
@ -1,6 +1,8 @@
 BSD 3-Clause License

-Copyright (c) 2017, CIRCL - Computer Incident Response Center Luxembourg
+Copyright (c) 2017-2018, Quinn Norton
+Copyright (c) 2017-2018, Raphaël Vinot
+Copyright (c) 2017-2018, CIRCL - Computer Incident Response Center Luxembourg
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -9,4 +9,4 @@ services:
  lookyloo:
     build: .
     ports:
-      - "5000:5000"
+      - "5000:5000"
--- a/requirements.txt
+++ b/requirements.txt
@ -2,7 +2,7 @@
 flask
 flask-bootstrap
 ete3
-bs4
+beautifulsoup4

 # Backend libs
 git+https://github.com/viper-framework/har2tree.git