Resolve merge conflicts between feature/css-optimization and main

Browse source

- Resolved conflicts in admin.html to keep CSS optimization changes
- Regenerated package-lock.json after merge
- All features from both branches are now integrated

...

This commit is contained in:

Deco Vander 2025-07-04 14:28:50 -04:00

parent 6d745e23f6 27c9d3da00

commit 9628da957b

18 changed files with 5638 additions and 386 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3439

package-lock.json generated

View file

File diff suppressed because it is too large Load diff