Merge branch 'master' into dev

This commit is contained in:
2019-12-06 08:51:49 +01:00
12 changed files with 1689 additions and 6 deletions

3
.gitignore vendored
View File

@@ -2,5 +2,8 @@
IntelliPhoto/build-*/
src/build-*/
#
IntelliPhoto.pro.user
# macOS Environment Files
.DS_STORE