Merge remote-tracking branch 'upstream/master'

pull/20/head
Michael Schaefer 2018-03-16 12:13:37 +01:00
commit f6a003522b
3 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,8 @@
BSD 3-Clause License 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. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

View File

@ -9,4 +9,4 @@ services:
lookyloo: lookyloo:
build: . build: .
ports: ports:
- "5000:5000" - "5000:5000"

View File

@ -2,7 +2,7 @@
flask flask
flask-bootstrap flask-bootstrap
ete3 ete3
bs4 beautifulsoup4
# Backend libs # Backend libs
git+https://github.com/viper-framework/har2tree.git git+https://github.com/viper-framework/har2tree.git