Skip to content

Commit af796d5

Browse files
Merge branch 'master' into testerra2
# Conflicts: # driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/pageobjects/AbstractPage.java
2 parents b439e46 + 189f482 commit af796d5

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/pageobjects/AbstractPage.java

Whitespace-only changes.

report-ng/app/package-lock.json

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

report-ng/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"aurelia-typed-observable-plugin": "^0.4.2",
4141
"aurelia-ui-virtualization": "^1.0.0-rc2",
4242
"highlight.js": "^10.3.2",
43-
"moment": "^2.29.1",
43+
"moment": "^2.29.2",
4444
"moment-duration-format": "^2.3.2",
4545
"pixelmatch": "^5.2.1",
4646
"protobufjs": "^6.10.2",

0 commit comments

Comments
 (0)