mirror of
https://github.com/spalencsar/bearhub.git
synced 2026-07-10 09:54:16 +02:00
Merge branch 'master' into staging
# Conflicts: # fpakman/view/qt/window.py
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@ env
|
|||||||
*.pyc
|
*.pyc
|
||||||
.idea
|
.idea
|
||||||
__pycache__
|
__pycache__
|
||||||
|
*.orig
|
||||||
|
|||||||
Reference in New Issue
Block a user