feat: add infomaterial and merch items #5383

Merged
hl merged 13 commits from image-additions2 into master 2025-10-09 14:39:42 +00:00

13 Commits

Author SHA1 Message Date
d4f5b897ee Merge branch 'image-additions2' of git.fsfe.org:fsfe/fsfe-website into image-additions2
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-09 16:33:37 +02:00
hl
e3c2f98276 replace merchandise pics with horizontal ones
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-09 16:32:50 +02:00
e28dd3a071 Merge branch 'image-additions2' of git.fsfe.org:fsfe/fsfe-website into image-additions2 2025-10-09 16:18:41 +02:00
hl
1bdc7bff04 change balloon, remove redundant images
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-09 16:16:29 +02:00
hl
4b4099eb19 Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website into image-additions2 2025-10-09 16:14:50 +02:00
59881b50e9 fix items
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-09 16:01:54 +02:00
hl
ed037979f6 change order of balloon to 2
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-09 14:59:30 +02:00
hl
5558cbd278 Merge branch 'master' into image-additions2
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-09 12:59:24 +00:00
hl
1e8b4e7721 remove ampersand to please the XML gods
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-09 14:54:27 +02:00
hl
4df1745dd3 add merchandise info texts
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-09 14:49:27 +02:00
hl
425320cfe8 new promo pics: smaller file sizes
Some checks failed
continuous-integration/drone/pr Build is failing
2025-10-09 14:41:41 +02:00
hl
20cb663d67 Add promo pictures and data entry
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-07 17:51:45 +02:00
hl
61d4b16b2c add promo pics
All checks were successful
continuous-integration/drone/pr Build is passing
2025-10-07 17:18:05 +02:00