Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # angular.json # package-lock.json # package.json # src/app/app.component.html # src/app/app.routes.ts
This commit is contained in:
@@ -9,5 +9,6 @@
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
<login-form></login-form>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user