Merge branch 'develop' into plugins_system
# Conflicts: # src-tauri/tauri.conf.json
This commit is contained in:
commit
e9aa3aa8ac
42 files changed
+716
-589
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 5.4 KiB |
Reference in new issue
Block a user