Merge remote-tracking branch 'origin/main' into feature/lucide-icons-and-backwards-compatible

Browse Source

# Conflicts:
#	src/packages/core/property-editor/uis/tiny-mce/config/manifests.ts
#	src/packages/core/property-editor/uis/tiny-mce/manifests.ts

...

This commit is contained in:

Niels Lyngsø

2023-11-06 10:30:37 +01:00

parent 845e78e418 f2d2387676

commit 44d1ea285e

36 changed files with 1739 additions and 1433 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

2214

src/Umbraco.Web.UI.Client/package-lock.json generated

File diff suppressed because it is too large Load Diff