Merge branch 'master' into staging

# Conflicts:
#	fpakman/view/qt/window.py
This commit is contained in:
Vinicius Moreira
2019-06-14 17:26:46 -03:00

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@ env
*.pyc
.idea
__pycache__
*.orig