Skip to content

Commit

Permalink
Merge branch 'dev' into CUC-590_sendKey_bug
Browse files Browse the repository at this point in the history
# Conflicts:
#	backend/features/step_definitions/stepdefs.js
  • Loading branch information
sMeilbeck committed Aug 6, 2024
2 parents 43f42fb + 9bcd699 commit 1a5d624
Show file tree
Hide file tree
Showing 6 changed files with 373 additions and 238 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN mkdir /data
RUN mkdir /data/db
RUN mongod --fork --logpath /var/log/mongodb.log

# ----- BACKEND (from /backend dockerfile) -----------------------------------------------------------------------
# ----- BACKEND (from /backend dockerfile) ------------------------------------------------------------------------

# install chrome
RUN wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
Expand Down
Loading

0 comments on commit 1a5d624

Please sign in to comment.