Skip to content

Commit ac62e78

Browse files
committed
Merge branch 'develop' into prod
2 parents 76d784a + c0800ab commit ac62e78

File tree

1,057 files changed

+137420
-17760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,057 files changed

+137420
-17760
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ $RECYCLE.BIN/
162162
*.sqlite
163163
.DS_Store
164164
Setup/*.zip
165-
Setup/AdvancedInstaller/x86/ImageGlass-x86-cache
166-
Setup/AdvancedInstaller/x64/ImageGlass-x64-cache
165+
**/ImageGlass_9_x64-cache
167166
Source/ImageGlass/obj/Debug/DesignTimeResolveAssemblyReferences.cache
167+
**/Properties/launchSettings.json
168168

169169
BundleArtifacts
170170
BundleArtifactsUpload
86.5 KB
Loading
80.9 KB
Loading
72.4 KB
Loading

β€ŽAssets/Logo/2023/Logo.svgβ€Ž

Lines changed: 90 additions & 0 deletions
Loading

β€ŽAssets/Logo/2023/icon256.icoβ€Ž

201 KB
Binary file not shown.

β€ŽAssets/Logo/2023/icon48.icoβ€Ž

17.1 KB
Binary file not shown.

β€ŽAssets/github.psdβ€Ž

32.7 MB
Binary file not shown.

β€ŽAssets/instagram.psdβ€Ž

57.7 MB
Binary file not shown.

β€ŽAssets/youtube_bg.psdβ€Ž

33.6 MB
Binary file not shown.

0 commit comments

Comments
Β (0)