mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts: # src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts # src/app/core/cache/builders/remote-data-build.service.ts # src/app/core/core.effects.ts # src/app/core/core.reducers.ts # src/app/core/data/comcol-data.service.spec.ts # src/app/core/data/data.service.spec.ts # src/app/core/data/data.service.ts # src/app/core/shared/dspace-object.model.ts # src/app/shared/shared.module.ts # src/styles/_custom_variables.scss
This commit is contained in:
@@ -141,5 +141,10 @@ module.exports = {
|
||||
code: 'nl',
|
||||
label: 'Nederlands',
|
||||
active: false,
|
||||
}]
|
||||
}],
|
||||
item: {
|
||||
edit: {
|
||||
undoTimeout: 10000 // 10 seconds
|
||||
}
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user