Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bkimminich committed Nov 23, 2019
2 parents d7b5fe5 + 6f25be1 commit c5b9611
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -153,10 +153,11 @@ The OWASP Juice Shop core project team are:
### Code Contributors

Based on [GitHub](https://github.com/bkimminich/juice-shop-ctf) commits
on `master` as of Tue, 10 Apr 2018
on `master` as of Fri, 21 Nov 2019

- [Josh Grossman](httpps://github.com/tghosth) aka `tghosth`
- [Simon Basset](https://github.com/simbas) aka `simbas`
- [ElJeffe](https://github.com/jeffg2k) aka `jeffg2k`

## Licensing [![license](https://img.shields.io/github/license/bkimminich/juice-shop-ctf-server.svg)](LICENSE)

Expand Down

0 comments on commit c5b9611

Please sign in to comment.