src/config · fb153b7b1341f86c1291c2db904c11c5f164beaa · vtechworks / Dspace7 Angular

Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2

Kristof De Langhe authored 5 years ago

Conflicts:
	config/environment.default.js
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/config/global-config.interface.ts

2d3dfde6

Name	Last commit	Last update
..
auto-sync-config.interface.ts
browse-by-config.interface.ts
browse-by-type-config.interface.ts
cache-config.interface.ts
collection-page-config.interface.ts
config.interface.ts
form-config.interfaces.ts
global-config.interface.ts
item-page-config.interface.ts
lang-config.interface.ts
notifications-config.interfaces.ts
server-config.interface.ts
submission-config.interface.ts
theme.inferface.ts
universal-config.interface.ts