Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	assets/img/android-chrome-192x192.png
#	assets/img/android-chrome-256x256.png
#	assets/img/android-chrome-512x512.png
#	assets/img/apple-touch-icon.png
#	assets/img/favicon-16x16.png
#	assets/img/favicon-32x32.png
#	assets/img/favicon.ico
  • Loading branch information
supernord committed Feb 7, 2024
2 parents f6df44f + 7a1f4e7 commit 06aa62b
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 0 deletions.
Binary file modified assets/img/android-chrome-192x192.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/android-chrome-256x256.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/android-chrome-512x512.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/apple-touch-icon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/favicon-16x16.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/favicon-32x32.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/favicon.ico
100755 → 100644
Binary file not shown.

0 comments on commit 06aa62b

Please sign in to comment.