wip: take the master and put it in the awesome #2

Closed

Juno wants to merge 4 commits from master into awesome

pull from: master

merge into: Juno:awesome

Juno:awesome

Conversation 0 Commits 4 Files changed 1 +2 -3

4 commits

Author	SHA1	Message	Date
cannoli-fruit	51b2ef0ade	Fix broken merge smh	2026-07-23 01:44:38 -04:00
cannoli-fruit	564d4b26f2	Manually merged pr 2	2026-07-23 01:42:35 -04:00
cannoli-fruit	d735965c63	Moved cat up	2026-07-23 01:38:06 -04:00
Cody	c407194cd4	Merge pull request 'add a cat' (#1) from Juno/YouraMonster:awesome into master ... Reviewed-on: Cody/YouraMonster#1	2026-07-23 05:30:35 +00:00