Merge branch 'develop'

Browse Source

# Conflicts:
#	update/DesktopMagic.zip
#	update/updateInfo.json

...

This commit is contained in:

Stone-Red-Code

2021-11-06 19:04:04 +01:00

parent 921d6dfc20

commit ed84fe37ed

50 changed files with 1730 additions and 1333 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

src/DesktopMagic.Installer/DesktopMagic-Installer.exe

BIN

Binary file not shown.