Merge remote-tracking branch 'origin/2.2' into master-3.0

# Conflicts:
#	package.json
#	src/app/layouts/default-layout/default-layout.component.html
#	src/app/layouts/default-layout/default-layout.component.ts
#	yarn.lock
This commit is contained in:
grossmj
2024-07-22 19:16:37 +02:00
6 changed files with 10 additions and 9 deletions

View File

@ -90,4 +90,4 @@
<app-progress></app-progress>
<footer class="footer mat-app-background">GNS3 Web UI &copy; 2022 - v{{ uiVersion }}</footer>
<footer class="footer mat-app-background">GNS3 Web-UI &copy;2018-{{ currentYear }} v{{ uiVersion }}</footer>