Skip to content

Commit

Permalink
Merge branch 'develop' into feat/HKD-6/integration
Browse files Browse the repository at this point in the history
 Conflicts:
	views/js/loader/qtiPreviewer.min.js
	views/js/loader/qtiPreviewer.min.js.map
  • Loading branch information
jsconan committed Oct 30, 2024
2 parents 7b4297e + 68342c2 commit da61dc1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion views/js/loader/qtiPreviewer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/qtiPreviewer.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/previewer/component/qtiItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ define([
communicator: {
id: 'request',
module: 'core/communicator/request',
bundle: 'loader/vendor.min',
bundle: Object.keys(config.previewers || {}).length === 1 ? 'loader/vendor.min' : null,
category: 'communicator'
},
plugins: config.plugins || []
Expand Down

0 comments on commit da61dc1

Please sign in to comment.