Merge branch 'master' into forward_article

2024-05-02 12:16:59 -04:00 · 2024-05-02 12:16:59 -04:00 · cca9779da7
commit cca9779da7
parent 99f3f0e283 b219ed5f8d
7 changed files with 8 additions and 4 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,2 @@
-assets/ filter=lfs diff=lfs merge=lfs -text
+assets/* filter=lfs diff=lfs merge=lfs -text
-templates/images/ filter=lfs diff=lfs merge=lfs -text
+templates/images/* filter=lfs diff=lfs merge=lfs -text
--- a/assets/giga_chad.jpg
+++ b/assets/giga_chad.jpg
--- a/assets/google_cosplay.jpg
+++ b/assets/google_cosplay.jpg
--- a/assets/the_pipeline.svg
+++ b/assets/the_pipeline.svg
--- a/templates/images/favicon.ico
+++ b/templates/images/favicon.ico
--- a/templates/images/logo-z.svg
+++ b/templates/images/logo-z.svg
--- a/templates/images/webclip.png
+++ b/templates/images/webclip.png
`@ -1,2 +1,2 @@`
	`assets/ filter=lfs diff=lfs merge=lfs -text`	`assets/* filter=lfs diff=lfs merge=lfs -text`
	`templates/images/ filter=lfs diff=lfs merge=lfs -text`	`templates/images/* filter=lfs diff=lfs merge=lfs -text`