Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms

# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss
This commit is contained in:
Giuseppe Digilio
2018-07-12 14:56:57 +02:00
133 changed files with 6196 additions and 108 deletions

View File

@@ -23,9 +23,6 @@ git clone https://github.com/DSpace/dspace-angular.git
# change directory to our repo
cd dspace-angular
# install the global dependencies
yarn run global
# install the local dependencies
yarn install