Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dspace7 Angular
Manage
Activity
Members
Labels
Plan
Issues
42
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vtechworks
Dspace7 Angular
Commits
ee5e1351
Commit
ee5e1351
authored
5 years ago
by
Giuseppe Digilio
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts: # yarn.lock
parents
2013eade
030709ae
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
package.json
+4
-2
4 additions, 2 deletions
package.json
webpack/webpack.prod.js
+11
-6
11 additions, 6 deletions
webpack/webpack.prod.js
webpack/webpack.test.js
+0
-12
0 additions, 12 deletions
webpack/webpack.test.js
yarn.lock
+758
-1456
758 additions, 1456 deletions
yarn.lock
with
773 additions
and
1476 deletions
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment