mirror of
https://github.com/viliusle/miniPaint.git
synced 2026-02-06 13:36:45 +00:00
Merge origin/master
Conflicts: .gitignore
This commit is contained in:
parent
1675a9d1dc
commit
d7994166e2
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@ ehthumbs.db
|
||||
Thumbs.db
|
||||
nbproject/
|
||||
.git/
|
||||
77
|
||||
Loading…
Reference in New Issue
Block a user