Skip to content

Commit

Permalink
Merge branch 'dev' into ai
Browse files Browse the repository at this point in the history
# Conflicts:
#	Dockerfile
  • Loading branch information
OscarAkaElvis committed Oct 25, 2024
2 parents add68b6 + dd7ba0f commit 214c5fe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

### 3.8
- Updated logo
- Fixed minor problem in Dockerfile, updated to new alpine version

### 3.7
- Fixed menu command to avoid being detected as malware
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ RUN apk --no-cache add \
readline \
yaml \
libffi \
zlib \
openssl \
libcurl

# Make the ruby and Evil-WinRM paths available
Expand Down

0 comments on commit 214c5fe

Please sign in to comment.