Commit 987a116b authored by BorjaEst's avatar BorjaEst
Browse files

Merge branch 'master' into python_dev

parents 3f605830 0fca47d7
### VisualStudioCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
### Python
# Byte-compiled / optimized / DLL files
__pycache__/
......
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