Skip to content

Commit

Permalink
Merge branch 'release/26.x'
Browse files Browse the repository at this point in the history
* release/26.x:
  #3826 - Update dependencies
  #3826 - Update dependencies

% Conflicts:
%	inception/inception-bootstrap/src/main/ts_template/package-lock.json
%	inception/inception-brat-editor/src/main/ts_template/package-lock.json
%	inception/inception-diam-editor/src/main/ts_template/package-lock.json
%	inception/inception-diam/src/main/ts_template/package-lock.json
%	inception/inception-external-editor/src/main/ts_template/package-lock.json
%	inception/inception-html-editor/src/main/ts_template/package-lock.json
%	inception/inception-html-recogito-editor/src/main/ts_template/package-lock.json
%	inception/inception-js-api/src/main/ts_template/package-lock.json
%	inception/inception-pdf-editor/src/main/ts_template/package-lock.json
%	inception/inception-pdf-editor2/src/main/ts_template/package-lock.json
%	inception/inception-project-export/src/main/ts_template/package-lock.json
%	inception/inception-ui-dashboard-activity/src/main/ts_template/package-lock.json
%	inception/inception-ui-kb/src/main/ts_template/package-lock.json
%	inception/inception-ui-search/src/main/ts_template/package-lock.json
%	inception/pom.xml
  • Loading branch information
reckart committed Feb 22, 2023
2 parents 646a4b1 + 90fb8fe commit ffde41d
Show file tree
Hide file tree
Showing 16 changed files with 2,752 additions and 7,850 deletions.
624 changes: 25 additions & 599 deletions inception/inception-bootstrap/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

904 changes: 317 additions & 587 deletions inception/inception-brat-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

912 changes: 321 additions & 591 deletions inception/inception-diam-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

526 changes: 186 additions & 340 deletions inception/inception-diam/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

554 changes: 208 additions & 346 deletions inception/inception-html-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

1,366 changes: 258 additions & 1,108 deletions inception/inception-html-recogito-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

910 changes: 172 additions & 738 deletions inception/inception-js-api/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

405 changes: 165 additions & 240 deletions inception/inception-pdf-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

514 changes: 177 additions & 337 deletions inception/inception-pdf-editor2/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

922 changes: 175 additions & 747 deletions inception/inception-project-export/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

922 changes: 175 additions & 747 deletions inception/inception-recommendation/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

115 changes: 15 additions & 100 deletions inception/inception-ui-kb/src/main/ts_template/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ffde41d

Please sign in to comment.