Skip to content

Commit

Permalink
Merge branch 'pia-2.3-i18n' into pia-2.3-machine-translations
Browse files Browse the repository at this point in the history
  • Loading branch information
kosmas58 committed Dec 31, 2019
2 parents fd6a303 + d3d9da4 commit 18c0667
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-jasmine-html-reporter": "^1.5.1",
"prettier": "^1.18.2",
"pretty-quick": "^2.0.1",
"protractor": "~5.4.0",
Expand Down
15 changes: 4 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6401,17 +6401,10 @@ karma-coverage-istanbul-reporter@~2.1.1:
istanbul-api "^2.1.6"
minimatch "^3.0.4"

karma-jasmine-html-reporter@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
dependencies:
karma-jasmine "^1.0.2"

karma-jasmine@^1.0.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
karma-jasmine-html-reporter@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.1.tgz#0fad2d2ac416bc04724318aad29b89bd86f7bfbc"
integrity sha512-LlLqsoGyxT1981z46BRaC1SaY4pTo4EHCA/qZvJEMQXzTtGMyIlmwtxny6FiLO/N/OmZh69eaoNzvBkbHVVFQA==

karma-jasmine@~2.0.1:
version "2.0.1"
Expand Down

0 comments on commit 18c0667

Please sign in to comment.