Skip to content
Permalink
Browse files

Merge branch 'master' into master

  • Loading branch information
Maffooch committed Nov 8, 2019
2 parents 42f1d4e + a0e0832 commit ae2f4398079c29f1fda5c8bf0d30565707f7aab2
Showing with 4 additions and 0 deletions.
  1. +1 −0 CONTRIBUTING.md
  2. +2 −0 README.md
  3. +1 −0 setup/postgresql.txt
@@ -60,6 +60,7 @@ DefectDojo.

0. In dev branch, the code should be python 3.5 compliant.


[dojo_settings]: /dojo/settings/settings.dist.py "DefectDojo settings file"
[setup_py]: /setup.py "Python setup script"
[setup_bash]: /setup.bash "Bash setup script"
@@ -138,10 +138,12 @@ Proceeds are used for testing, infrastructure, etc.
[![Xing](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/XING_logo.png)](https://corporate.xing.com/en/about-xing/security/)
[![10Security](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/10Security-logo.png)](https://10security.com/services-by-technology/defectdojo-commercial-support/)
[![GCSecurity](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/gc_logo_2018.png)](https://gcsec.com.br/)
[![ISAAC](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/isaac.png)](https://isaac.nl "ISAAC")
[![Timo-Pagel](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/timo-pagel-logo.png )](https://pagel.pro/)
[![SDA-SE](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/sda-se-logo.png)](https://sda-se.com/)
[![Signal-Iduna](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/signal-iduna.png)](https://signal-iduna.de/)


Interested in becoming a sponsor and having your logo displayed? Please review
our [sponsorship information](SPONSORING.md) or email greg.anderson@owasp.org

@@ -1,3 +1,4 @@

# Pip installs needed for PostgreSQL DB support
-r ../requirements.txt
psycopg2-binary==2.7.5

0 comments on commit ae2f439

Please sign in to comment.
You can’t perform that action at this time.