Skip to content

Commit

Permalink
Merge branch '2.2' into 3.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/main.a1204c9aa64b1cc15d28.js
  • Loading branch information
grossmj committed Jul 13, 2024
2 parents 3f7f5a3 + 6951137 commit ea339af
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 2.2.48.1 12/07/2024

* Bundle web-ui v2.2.48.1

## 2.2.48 08/07/2024

* Bundle web-ui v2.2.48
Expand Down

0 comments on commit ea339af

Please sign in to comment.