Skip to content

Commit 96b4df1

Browse files
author
BRUNER Patrick
committed
Merge Development into feature/f11-compact-mode
Resolve Resources.Designer.cs conflict: take Development's regenerated designer (themed image properties removed) and add the two detach-mode string properties from this branch.
2 parents 4603260 + f94a755 commit 96b4df1

44 files changed

Lines changed: 233 additions & 196 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/LogExpert.Resources/Resources.Designer.cs‎

Lines changed: 88 additions & 88 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)