Commit 3d7865fb authored by Hanchuan Wu's avatar Hanchuan Wu
Browse files

Merge branch 'cherry-pick-1163361a' into 'releases/3.4'

Merge branch 'feature/gitignore-add-vscode' into 'master'

See merge request !2741
parents cc69209b ead6f56f
Pipeline #6542 canceled with stage
in 2 seconds
......@@ -8,6 +8,7 @@ Testing
# hidden files
.cproject
.project
.vscode
# left overs from git rebase
*.orig
......
Markdown is supported
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