Skip to content
GitLab
Commit 834ca7a4 authored by zhaikangning's avatar zhaikangning
Browse files

Merge the master branch code to solve the conflicts of the mainwindow, sidebar and other codes

parents b0369506 150084bc
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment