Learn more about cloning repositories
You have read-only access
Merge remote-tracking branch 'remotes/origin/master' into shibboleth# Conflicts: # src/app/app-routing.module.ts # src/app/core/auth/auth.service.ts # src/app/shared/shared.module.ts
Everything looks good. We'll let you know here if there's anything you should know about.